updated class prefixes on categories for safety