tidy up mappings

using strings as we now use slugs