(Re)name the category functions properly