Intermediate commit.
Renamed stuff.