Changing names for classes and layouts