HOPKINS: More refactoring and renaming in ObjectsManager