refactor : some classes were renamed