BUR #8595 has been approved by @evazion.
create alias kiki -> kiki_(majo_no_takkyuubin)
rename tombo -> tombo_(majo_no_takkyuubin)
rename osono -> osono_(majo_no_takkyuubin)
Only these characters (according to wiki) that didn't have any qualifiers despite the rest of the film's characters have one. Especially Kiki, which is a generic name.