XML naming refactor because naming things is hard