Add an option to disable parameter naming
Finally resolved the annoying parameter renaming issue