Use consistent naming in sg suite