Use consistent naming in sgs suite