more renaming and naming