Renaming types to model