class refactoring step 1 -> unified class naming