more renaming, fixed syntax error
Merge pull request #8 from cschroed-usgs/master

more renaming, fixed syntax error