Specify headers as map instead of individual params.
Rename a few things.