Use same naming for arguments to generate command