Add support for diff resource name vs key
Rename and change some things back to merchant, needed for url construction