[Truffle] Fix variable type and name.
[Truffle] Move Hash guards in HashGuards and fix the build.