Changed hash-related names to avoid conflicts
Changing hash-related names to eliminate conflict (missed one)
Merge pull request #202 from APriestman/master

Changed hash-related names to avoid conflicts