diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py
index b2436a2f8d..5387bea740 100644
--- a/awx/main/models/credential.py
+++ b/awx/main/models/credential.py
@@ -35,7 +35,7 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
         ('rax',    _('Rackspace')),
         ('vmware', _('VMware')),
         ('gce',    _('Google Compute Engine')),
-        ('azure',  _('Windows Azure')),
+        ('azure',  _('Microsoft Azure')),
     ]
 
     PASSWORD_FIELDS = ('password', 'ssh_key_data', 'ssh_key_unlock',
diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index ac46232394..e3ab8f6c35 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -740,7 +740,7 @@ class InventorySourceOptions(BaseModel):
         ('rax',    _('Rackspace Cloud Servers')),
         ('ec2',    _('Amazon EC2')),
         ('gce',    _('Google Compute Engine')),
-        ('azure',  _('Windows Azure')),
+        ('azure',  _('Microsoft Azure')),
         ('vmware', _('VMWare')),
     ]
 
@@ -829,7 +829,7 @@ class InventorySourceOptions(BaseModel):
 
     @classmethod
     def get_azure_region_choices(self):
-        """Return a complete list of regions in Windows Azure, as a list of
+        """Return a complete list of regions in Microsoft Azure, as a list of
         two-tuples.
         """
         # It's not possible to get a list of regions from Azure without
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index e8dc229617..f54d19eba6 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -818,7 +818,7 @@ class RunInventoryUpdate(BaseTask):
         """Return private data needed for inventory update.
         If no private data is needed, return None.
         """
-        # If this is Windows Azure or GCE, return the RSA key
+        # If this is Microsoft Azure or GCE, return the RSA key
         if inventory_update.source in ('azure', 'gce'):
             credential = inventory_update.credential
             return decrypt_field(credential, 'ssh_key_data')
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 4aae733456..dbde4ee81c 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -438,7 +438,7 @@ GCE_INSTANCE_ID_VAR = None
 
 
 # -------------------
-# -- Windows Azure --
+# -- Microsoft Azure --
 # -------------------
 
 # It's not possible to get zones in Azure without authenticating, so we
@@ -461,12 +461,12 @@ AZURE_REGION_CHOICES = [
 AZURE_REGIONS_BLACKLIST = []
 
 # Inventory variable name/value for determining whether a host is active
-# in Windows Azure.
+# in Microsoft Azure.
 AZURE_ENABLED_VAR = 'status'
 AZURE_ENABLED_VALUE = 'created'
 
 # Filter for allowed group and host names when importing inventory from
-# Windows Azure.
+# Microsoft Azure.
 AZURE_GROUP_FILTER = r'^.+$'
 AZURE_HOST_FILTER = r'^.+$'
 AZURE_EXCLUDE_EMPTY_GROUPS = True
diff --git a/awx/ui/static/js/helpers/Credentials.js b/awx/ui/static/js/helpers/Credentials.js
index 151e29f256..f31e237011 100644
--- a/awx/ui/static/js/helpers/Credentials.js
+++ b/awx/ui/static/js/helpers/Credentials.js
@@ -73,7 +73,7 @@ angular.module('CredentialsHelper', ['Utilities'])
                     scope.sshKeyDataLabel = 'Management Certificate';
                     scope.subscription_required = true;
                     scope.key_required = true;
-                    scope.key_description = "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Windows Azure console.<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
+                    scope.key_description = "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console.<div class=\"popover-footer\"><span class=\"key\">esc</span> or click to close</div>";
                     scope.key_hint= "drag and drop a management certificate file on the field below";
                     break;
                 case 'vmware':