GPII-2996: Normalize names, re-order, and add comments.
GPII-2996: Normalize names, re-order, and add comments.

Apologies for any merge conflicts this causes ;).

mrtyler/gpii-terraform,mrtyler/gpii-terraform,mrtyler/gpii-infra,mrtyler/gpii-infra,mrtyler/gpii-infra,mrtyler/gpii-infra,mrtyler/gpii-terraform