HOPKINS: More renaming in ObjectsManager