HOPKINS: Some renaming and refactoring in Globals and LinesManager