Make variable names more clear.
Make variable names more clear.

[#166938709](https://www.pivotaltracker.com/story/show/166938709)

Co-authored-by: Steve Taylor <2618d8eeb38db5666975df4fd945cc4512e3f384@pivotal.io>

cloudfoundry/cli,cloudfoundry/cli,cloudfoundry/cli