Off to edit, although when I was using the as-far-as-I-can-tell correct names from canon, they were showing up as the weird versions in the tag sidebar.