Use raw_name when cleaning up categories to prevent collisions