Further NameHash adaptions.