More cleanup and missed renaming