Fix new argument naming convention and Union types.
Fix of depreciated MoJo parameter configuration.