Updated category naming standard