renaming - stage 2: make naming consistent