Category 1 renaming
Category 2+3 renaming