Renaming and optimisation of class names