mass renaming for consistent structure