Rename of classes