Use ChainHash
instead of BlockHash
as applicable
#2662
Merged
ChainHash
instead of BlockHash
as applicable
#2662