HHH-9154 - keywords as parameter names

   gah... missed in initial commit for cherry-pick