new fancier names
Merge pull request #177 from STIXProject/new-names

new fancier names