Removed outdated categories, add new

Made sure all the capitalization and language exactly matches the
current categories as programmed into 3.10 for sorting on the public
interface,