I did, yes, the entire thing will be consistent when I'm done.
Better be extra careful with the Wikidata terminology though, it's difficult enough on its own. ^^