updated variable names
Merge pull request #45 from spotfinder/mike

updated variable names