Minor renaming
Merge pull request #1008 from hurtonm/master

Minor renaming