Rename fns to S2*. Fixes #12