Consistently name new parameters

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>