kodi; this means that anyone who tries to use
xbmc will have to use
kodi instead. The point is to keep all these questions together for obvious reasons, but to go forward with the correct current name.
Sort of unfortunately, it means all the questions about XBMC from before the name change are now tagged "kodi". I don't think this is a big deal, but if anyone can think of a good reason to reverse the merge, please post an answer here.