HOPKINS: More renaming in ObjectsManager and globals