nomenclature changes
Merge pull request #524 from continuuity/feature/resource-google

nomenclature changes