Removed deprecated shortname categorisation functions.
Changed default names in some categorisation functions.

The deprecation period for default name changes has ended and the
new names are now defaults and warnings are removed.
Removed tests for categorisation function deprecations.