Change name of some classes