Rename of classes and layers