Renaming models in more clean way
Following basic implementation