housekeeping
Correct merge artifacts
Renamed CupbolaTESR to CupolaTESR