Rename and split some classes and methods