Since we're refactoring the old code, get rid of the old bug with <name> elements, since there is no such thing.