More consistent naming of NBT types
Merge pull request #112 from saml/master

More consistent naming of NBT types