renaming the wa/pa to something more sensible