gz-14: Fixed consistency issues with new name changes.
gz-14: Fixed consistency issues with new name changes.

PolicyStat/GitZen,PolicyStat/GitZen,LHN/lhn-gitzen,LHN/lhn-gitzen,LHN/lhn-gitzen,LHN/lhn-gitzen