Coding changes on new name and order

I changd the names of the categories, and corrected the corresponding
coding to reflect the new categories.