Updates naming and added CS line clipping