HOPKINS: Rename variables and mild code rework in LinesManager