some cleanup and renaming
some cleanup and renaming