consistency
Merge pull request #76 from craigspaeth/master

@craigspaeth: Consistent naming