Rename sql files according to new conventions
This just drops the redundant -swh prefix.
Related to T2736