diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
index 753d3560c5..6f3997a078 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
@@ -544,7 +544,7 @@
         flavor: ['OS::Nova::Flavor', ''],
         image: ['OS::Glance::Image', ''],
         volume: ['OS::Cinder::Volumes', ''],
-        instance: ['OS::Nova::Instance', 'metadata']
+        instance: ['OS::Nova::Server', 'metadata']
       };
 
       angular.forEach(resourceTypes, applyForResourceType);
diff --git a/openstack_dashboard/static/app/core/metadata/metadata.service.js b/openstack_dashboard/static/app/core/metadata/metadata.service.js
index 56522a4eee..1ba833b704 100644
--- a/openstack_dashboard/static/app/core/metadata/metadata.service.js
+++ b/openstack_dashboard/static/app/core/metadata/metadata.service.js
@@ -86,7 +86,7 @@
           aggregate: 'OS::Nova::Aggregate',
           flavor: 'OS::Nova::Flavor',
           image: 'OS::Glance::Image',
-          instance: 'OS::Nova::Instance'
+          instance: 'OS::Nova::Server'
         }[resource]
       };
       if (propertiesTarget) {
diff --git a/openstack_dashboard/static/app/core/metadata/metadata.service.spec.js b/openstack_dashboard/static/app/core/metadata/metadata.service.spec.js
index fa29a9cb66..ea33882af1 100644
--- a/openstack_dashboard/static/app/core/metadata/metadata.service.spec.js
+++ b/openstack_dashboard/static/app/core/metadata/metadata.service.spec.js
@@ -121,7 +121,7 @@
       spyOn(glance, 'getNamespaces');
       metadataService.getNamespaces('instance', 'metadata');
       expect(glance.getNamespaces)
-      .toHaveBeenCalledWith({ resource_type: 'OS::Nova::Instance',
+      .toHaveBeenCalledWith({ resource_type: 'OS::Nova::Server',
                               properties_target: 'metadata' }, false);
     });
 
diff --git a/openstack_dashboard/static/app/core/openstack-service-api/glance.service.js b/openstack_dashboard/static/app/core/openstack-service-api/glance.service.js
index 3ce29ca2c5..45d7ace9d6 100644
--- a/openstack_dashboard/static/app/core/openstack-service-api/glance.service.js
+++ b/openstack_dashboard/static/app/core/openstack-service-api/glance.service.js
@@ -307,7 +307,7 @@
      *
      * @param {string} params.properties_target
      * The properties target, if the resource type has more than one type
-     * of property. For example, the OS::Nova::Instance resource type has
+     * of property. For example, the OS::Nova::Server resource type has
      * "metadata" and "scheduler_hints" properties targets.
      *
      * @param {boolean} params.paginate
@@ -359,7 +359,7 @@
      * The listing result is an object with property "items".
      * Each item is a resource type. Resource types are Strings that
      * correlate to Heat and Searchlight resource types.
-     * For example: OS::Glance::Image and OS::Nova::Instance.
+     * For example: OS::Glance::Image and OS::Nova::Server.
      *
      */
     function getResourceTypes() {
diff --git a/releasenotes/notes/bp-add-server-metadata-a5d5582966ef25c5.yaml b/releasenotes/notes/bp-add-server-metadata-a5d5582966ef25c5.yaml
index 8f512e4d59..a39637b4a6 100644
--- a/releasenotes/notes/bp-add-server-metadata-a5d5582966ef25c5.yaml
+++ b/releasenotes/notes/bp-add-server-metadata-a5d5582966ef25c5.yaml
@@ -2,4 +2,4 @@
 features:
   - Added the Metadata tab to the new Launch Instance workflow to allow adding
     key-value metadata to an instance at launch. This includes any properties
-    from the OS::Nova::Instance namespace of the glance metadata definitions.
\ No newline at end of file
+    from the OS::Nova::Server namespace of the glance metadata definitions.
\ No newline at end of file