Rename of the models classes