massive xml refactoring (name -> type) undone