Somehow these changes have leaked into upstream/develop
Fixing tests
Merge pull request #40 from alxdarksage/develop

Name changes to fix build