HOPKINS: Some more renaming in LinesManager. Fix a bug in last loop condition