HOPKINS: Some renaming and refactoring in ObjectsManager and LinesManager