Ooops, changing type tag names broke all tests