Reformatting file and class names