Rename data to clientData in the inlined overloads. This change is transparent for any users. Rename shortHelpString to shortHelp (dito for longHelp). Although this change is in general visible for any users, Phoenix already mangles the the parameter names to strip the 'String' suffix.