Cleaning up code.
Renaming.
Finishing rename.