More cleanup and renaming