Lots of changes to models and some renaming