Refractored some class names