Spell enumerated value more naturally.

Feedback from @dhermes:
https://github.com/GoogleCloudPlatform/gcloud-python/pull/449/files#r22115879
Improve variable names.

Feedback from @dhermes:
https://github.com/GoogleCloudPlatform/gcloud-python/pull/449/files#r22116090