More consistent naming of NBT types

Fixes #110