Removed some now-unecessary variables and made some naming changes.
Removed some now-unecessary variables and made some naming changes.

ILMTitan/google-cloud-powershell,marceloyuela/google-cloud-powershell,chrsmith/google-cloud-powershell,marceloyuela/google-cloud-powershell,GoogleCloudPlatform/google-cloud-powershell,marceloyuela/google-cloud-powershell