HOPKINS: Some renaming and refactoring in LinesManager