Use consistent naming in sfc suite