Cleanup and renaming done