more renaming and cleanup