diff --git a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts
index ef1ac2f6..999d2fc6 100644
--- a/packages/azuredeployer.gbapp/dialogs/StartDialog.ts
+++ b/packages/azuredeployer.gbapp/dialogs/StartDialog.ts
@@ -105,10 +105,10 @@ export class StartDialog {
 
     instance.botId = botId;
     instance.state = 'active';
-    instance.com.brUsername = username;
-    instance.com.brPassword = password;
-    instance.com.brSubscriptionId = subscriptionId;
-    instance.com.brLocation = location;
+    instance.cloudUsername = username;
+    instance.cloudPassword = password;
+    instance.cloudSubscriptionId = subscriptionId;
+    instance.cloudLocation = location;
     instance.marketplaceId = appId;
     instance.marketplacePassword = appPassword;
     instance.adminPass = GBAdminService.getRndPassword();
diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
index 4455ebb3..1d590c48 100644
--- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
+++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
@@ -394,16 +394,16 @@ export class AzureDeployerService implements IGBInstallationDeployer {
     await this.enableResourceProviders('Microsoft.Sql');
 
     GBLogEx.info(0, `Deploying Deploy Group (It may take a few minutes)...`);
-    await this.createDeployGroup(name, instance.com.brLocation);
+    await this.createDeployGroup(name, instance.cloudLocation);
 
     let serverFarm;
     let serverName;
 
     if (process.env.DEPLOY_WEB) {
       GBLogEx.info(0, `Deploying Bot Server...`);
-      serverFarm = await this.createHostingPlan(name, `${name}-server-plan`, instance.com.brLocation);
+      serverFarm = await this.createHostingPlan(name, `${name}-server-plan`, instance.cloudLocation);
       serverName = `${name}-server`;
-      await this.createServer(serverFarm.id, name, serverName, instance.com.brLocation);
+      await this.createServer(serverFarm.id, name, serverName, instance.cloudLocation);
     }
 
     GBLogEx.info(0, `Deploying Bot Storage...`);
@@ -417,9 +417,9 @@ export class AzureDeployerService implements IGBInstallationDeployer {
       administratorLogin,
       administratorPassword,
       storageServer,
-      instance.com.brLocation
+      instance.cloudLocation
     );
-    await this.createStorage(name, storageServer, storageName, instance.com.brLocation);
+    await this.createStorage(name, storageServer, storageName, instance.cloudLocation);
     instance.storageUsername = administratorLogin;
     instance.storagePassword = administratorPassword;
     instance.storageName = storageName;
@@ -429,7 +429,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
     // TODO: Enable in .env
     // GBLogEx.info(min, `Deploying Search...`);
     // const searchName = `${name}-search`.toLowerCase();
-    // await this.createSearch(name, searchName, instance.com.brLocation);
+    // await this.createSearch(name, searchName, instance.cloudLocation);
     // const searchKeys = await this.searchClient.adminKeys.get(name, searchName);
     // instance.searchHost = `${searchName}.search.windows.net`;
     // instance.searchIndex = 'azuresql-index';
@@ -437,13 +437,13 @@ export class AzureDeployerService implements IGBInstallationDeployer {
     // instance.searchKey = searchKeys.primaryKey;
 
     // GBLogEx.info(min, `Deploying Speech...`);
-    // const speech = await this.createSpeech(name, `${name}speech`, instance.com.brLocation);
+    // const speech = await this.createSpeech(name, `${name}speech`, instance.cloudLocation);
     // keys = await this.cognitiveClient.accounts.listKeys(name, speech.name);
     // instance.speechEndpoint = speech.properties.endpoint;
     // instance.speechKey = keys.key1;
 
     // GBLogEx.info(min, `Deploying Text Analytics...`);
-    // const textAnalytics = await this.createTextAnalytics(name, `${name}-textanalytics`, instance.com.brLocation);
+    // const textAnalytics = await this.createTextAnalytics(name, `${name}-textanalytics`, instance.cloudLocation);
     // instance.textAnalyticsEndpoint = textAnalytics.properties.endpoint.replace(`/text/analytics/v2.0`, '');
 
     GBLogEx.info(0, `Deploying SpellChecker...`);
@@ -451,8 +451,8 @@ export class AzureDeployerService implements IGBInstallationDeployer {
     instance.spellcheckerEndpoint = spellChecker.properties.endpoint;
 
     // GBLogEx.info(min, `Deploying NLP...`);
-    // const nlp = await this.createNLP(name, `${name}-nlp`, instance.com.brLocation);
-    // const nlpa = await this.createNLPAuthoring(name, `${name}-nlpa`, instance.com.brLocation);
+    // const nlp = await this.createNLP(name, `${name}-nlp`, instance.cloudLocation);
+    // const nlpa = await this.createNLPAuthoring(name, `${name}-nlpa`, instance.cloudLocation);
     // instance.nlpEndpoint = nlp.properties.endpoint;
 
 
@@ -472,7 +472,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
       instance.nlpKey,
       instance.marketplaceId,
       instance.marketplacePassword,
-      instance.com.brSubscriptionId
+      instance.cloudSubscriptionId
     );
 
     GBLogEx.info(0, `Waiting one minute to finish NLP service and keys creation...`);
@@ -486,7 +486,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
     // instance.nlpKey = keys.key1;
 
     // instance.nlpAuthoringKey = authoringKeys.key1;
-    // const nlpAppId = await this.createNLPService(name, name, instance.com.brLocation, culture, instance.nlpAuthoringKey);
+    // const nlpAppId = await this.createNLPService(name, name, instance.cloudLocation, culture, instance.nlpAuthoringKey);
     // instance.nlpAppId = nlpAppId;
 
     if (process.env.DEPLOY_WEB) {
@@ -511,10 +511,10 @@ export class AzureDeployerService implements IGBInstallationDeployer {
     const instance = <IGBInstance>{};
     instance.state = 'active';
     instance.botId = title;
-    instance.com.brUsername = username;
-    instance.com.brPassword = password;
-    instance.com.brSubscriptionId = subscriptionId;
-    instance.com.brLocation = cloudLocation;
+    instance.cloudUsername = username;
+    instance.cloudPassword = password;
+    instance.cloudSubscriptionId = subscriptionId;
+    instance.cloudLocation = cloudLocation;
     instance.nlpAuthoringKey = authoringKey;
     instance.marketplaceId = appId;
     instance.marketplacePassword = appPassword;
@@ -629,7 +629,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
 
     const token = new StaticAccessToken();
 
-    this.com.br = new ResourceManagementClient(token, subscriptionId);
+    this.cloud = new ResourceManagementClient(token, subscriptionId);
     this.webSiteClient = new WebSiteManagementClient(token, subscriptionId);
     this.storageClient = new SqlManagementClient(token, subscriptionId);
     this.cognitiveClient = new CognitiveServicesManagementClient(token, subscriptionId);
@@ -904,13 +904,13 @@ export class AzureDeployerService implements IGBInstallationDeployer {
   private async createDeployGroup(name: string, location: string) {
     const params = { location: location };
 
-    return await this.com.br.resourceGroups.createOrUpdate(name, params);
+    return await this.cloud.resourceGroups.createOrUpdate(name, params);
   }
 
   private async enableResourceProviders(name: string) {
-    const ret = await this.com.br.providers.get(name);
+    const ret = await this.cloud.providers.get(name);
     if (ret.registrationState === 'NotRegistered') {
-      await this.com.br.providers.register(name);
+      await this.cloud.providers.register(name);
     }
   }
 
@@ -980,7 +980,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
 
   private async updateWebisteConfig(group: string, name: string, serverFarmId: string, instance: IGBInstance) {
     const parameters: Site = {
-      location: instance.com.brLocation,
+      location: instance.cloudLocation,
       serverFarmId: serverFarmId,
       siteConfig: {
         appSettings: [
@@ -988,10 +988,10 @@ export class AzureDeployerService implements IGBInstallationDeployer {
           { name: 'WEBSITE_NODE_DEFAULT_VERSION', value:  await GBAdminService.getNodeVersion() },
           { name: 'ADMIN_PASS', value: `${instance.adminPass}` },
           { name: 'BOT_ID', value: `${instance.botId}` },
-          { name: 'CLOUD_SUBSCRIPTIONID', value: `${instance.com.brSubscriptionId}` },
-          { name: 'CLOUD_LOCATION', value: `${instance.com.brLocation}` },
-          { name: 'CLOUD_USERNAME', value: `${instance.com.brUsername}` },
-          { name: 'CLOUD_PASSWORD', value: `${instance.com.brPassword}` },
+          { name: 'CLOUD_SUBSCRIPTIONID', value: `${instance.cloudSubscriptionId}` },
+          { name: 'CLOUD_LOCATION', value: `${instance.cloudLocation}` },
+          { name: 'CLOUD_USERNAME', value: `${instance.cloudUsername}` },
+          { name: 'CLOUD_PASSWORD', value: `${instance.cloudPassword}` },
           { name: 'MARKETPLACE_ID', value: `${instance.marketplaceId}` },
           { name: 'MARKETPLACE_SECRET', value: `${instance.marketplacePassword}` },
           { name: 'STORAGE_DIALECT', value: `${instance.storageDialect}` },
diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts
index eb2ebf03..1a4339a2 100644
--- a/packages/core.gbapp/services/GBCoreService.ts
+++ b/packages/core.gbapp/services/GBCoreService.ts
@@ -325,10 +325,10 @@ export class GBCoreService implements IGBCoreService {
 ADDITIONAL_DEPLOY_PATH=
 ADMIN_PASS=${instance.adminPass}
 BOT_ID=${instance.botId}
-CLOUD_SUBSCRIPTIONID=${instance.com.brSubscriptionId}
-CLOUD_LOCATION=${instance.com.brLocation}
-CLOUD_USERNAME=${instance.com.brUsername}
-CLOUD_PASSWORD=${instance.com.brPassword}
+CLOUD_SUBSCRIPTIONID=${instance.cloudSubscriptionId}
+CLOUD_LOCATION=${instance.cloudLocation}
+CLOUD_USERNAME=${instance.cloudUsername}
+CLOUD_PASSWORD=${instance.cloudPassword}
 MARKETPLACE_ID=${instance.marketplaceId}
 MARKETPLACE_SECRET=${instance.marketplacePassword}
 STORAGE_DIALECT=${instance.storageDialect}
diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts
index 06ddb584..db05dd96 100644
--- a/packages/core.gbapp/services/GBDeployer.ts
+++ b/packages/core.gbapp/services/GBDeployer.ts
@@ -382,7 +382,7 @@ export class GBDeployer implements IGBDeployer {
    */
   public async publishNLP(instance: IGBInstance): Promise<void> {
     const service = await AzureDeployerService.createInstance(this);
-    const res = await service.publishNLP(instance.com.brLocation, instance.nlpAppId, instance.nlpAuthoringKey);
+    const res = await service.publishNLP(instance.cloudLocation, instance.nlpAppId, instance.nlpAuthoringKey);
     if (res.status !== 200 && res.status !== 201) {
       throw res.bodyAsText;
     }
@@ -393,7 +393,7 @@ export class GBDeployer implements IGBDeployer {
    */
   public async trainNLP(instance: IGBInstance): Promise<void> {
     const service = await AzureDeployerService.createInstance(this);
-    const res = await service.trainNLP(instance.com.brLocation, instance.nlpAppId, instance.nlpAuthoringKey);
+    const res = await service.trainNLP(instance.cloudLocation, instance.nlpAppId, instance.nlpAuthoringKey);
     if (res.status !== 200 && res.status !== 202) {
       throw res.bodyAsText;
     }
@@ -423,7 +423,7 @@ export class GBDeployer implements IGBDeployer {
   public async refreshNLPEntity(instance: IGBInstance, listName, listData): Promise<void> {
     const service = await AzureDeployerService.createInstance(this);
     const res = await service.refreshEntityList(
-      instance.com.brLocation,
+      instance.cloudLocation,
       instance.nlpAppId,
       listName,
       instance.nlpAuthoringKey,
diff --git a/packages/core.gbapp/services/GBImporterService.ts b/packages/core.gbapp/services/GBImporterService.ts
index 330ced73..d6036033 100644
--- a/packages/core.gbapp/services/GBImporterService.ts
+++ b/packages/core.gbapp/services/GBImporterService.ts
@@ -80,10 +80,10 @@ export class GBImporter {
         instance.state = 'active';
         instance.adminPass = GBConfigService.get('ADMIN_PASS');
         instance.botId = GBConfigService.get('BOT_ID');
-        instance.com.brSubscriptionId = GBConfigService.get('CLOUD_SUBSCRIPTIONID');
-        instance.com.brLocation = GBConfigService.get('CLOUD_LOCATION');
-        instance.com.brUsername = GBConfigService.get('CLOUD_USERNAME');
-        instance.com.brPassword = GBConfigService.get('CLOUD_PASSWORD');
+        instance.cloudSubscriptionId = GBConfigService.get('CLOUD_SUBSCRIPTIONID');
+        instance.cloudLocation = GBConfigService.get('CLOUD_LOCATION');
+        instance.cloudUsername = GBConfigService.get('CLOUD_USERNAME');
+        instance.cloudPassword = GBConfigService.get('CLOUD_PASSWORD');
         instance.marketplaceId = GBConfigService.get('MARKETPLACE_ID');
         instance.marketplacePassword = GBConfigService.get('MARKETPLACE_SECRET');
         instance.storageDialect = GBConfigService.get('STORAGE_DIALECT');
diff --git a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
index f6b8c977..5efa037a 100644
--- a/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
+++ b/packages/whatsapp.gblib/services/WhatsappDirectLine.ts
@@ -1178,7 +1178,7 @@ private async sendButtonList(to: string, buttons: string[]) {
 
         text = await GBConversationalService.getTextFromAudioBuffer(
           this.min.instance.speechKey,
-          this.min.instance.com.brLocation,
+          this.min.instance.cloudLocation,
           buf,
           user.locale
         );
@@ -1191,7 +1191,7 @@ private async sendButtonList(to: string, buttons: string[]) {
 
           text = await GBConversationalService.getTextFromAudioBuffer(
             this.min.instance.speechKey,
-            this.min.instance.com.brLocation,
+            this.min.instance.cloudLocation,
             buf,
             user.locale
           );