More objects -> models renames

fixes #1406