Switch to nova-style arg names