HPCC-12401 Rename paramters so they don't clash with reserved words

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>