HOPKINS: Refactoring in ObjectsManager, renaming