Renamed some identifiers
Merge branch 'master' of https://github.com/mattgonzalez/WorkbenchRemote