Final clean up and renaming