More rearrangement and renaming.

Change-Id: Ia922c5bff1734a29b786ba95065f81c8dedf90cd
4 files changed