tweaked names, etc
Merge pull request #24 from mattinm/master

tweaked names, etc