Add rename arg handler
Add additional arg renames
Merge branch 'arg-rename-customization' into develop

* arg-rename-customization:
  Add additional arg renames
  Add rename arg handler