Change in names to suit GT
Merge pull request #9 from mcepeda/master

Change in names to suit GT