HOPKINS: Some renaming in ObjectsManager