cleaning up model renaming