Handle category renames correctly