Bug 994684 - Make hatchet key names consistent
1.0.33