more renaming and comments