model stuff and renaming