Renaming the renames

Renaming more things