Removed old renaming residue