Refractored names of classes