HOPKINS: Some refactoring and renaming in ObjectsManager