Use the new command line options

Havana deprecated the underscore variants.
Create the new endpoints for Havana