Updated category naming