nomenclature changes

Google provider, nomenclature changes only