Fixing merge changes. Performing the Grand Renaming.