Change some classes name