Fix category separator.

Refs #8948
Fix problems with parameter names conflicting with coding standards.

Refs #8948
Merge branch 'feature/8948_polarisation_corrections' into develop