HOPKINS: Some refactoring and renaming in LinesManager and ObjectsManager