Simplified hash protocol.
Some naming improvements.