Renamed assignments and locations models