Remove S appendix from function names

Not needed now we can import qualified