More consistent naming of NBT types