Merge "More rearrangement and renaming."