Changed some names, mostly a test
Merge pull request #1 from EnacheB/master

Changed some names, mostly a test