diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index 09e118d414..fdcf7dedf9 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -332,7 +332,7 @@ class Resource(object):
 
     def make_replacement(self, new_tmpl_id):
         # 1. create the replacement with "replaces" = self.id
-        #  Don't set physical_resource_id so that a create is triggered.
+        # Don't set physical_resource_id so that a create is triggered.
         rs = {'stack_id': self.stack.id,
               'name': self.name,
               'properties_data': self._stored_properties_data,
@@ -1355,7 +1355,7 @@ class Resource(object):
         """Checks that the physical resource is in its expected state.
 
         Gets the current status of the physical resource and updates the
-        database accordingly.  If check is not supported by the resource,
+        database accordingly. If check is not supported by the resource,
         default action is to fail and revert the resource's status to its
         original state with the added message that check was not performed.
         """
diff --git a/heat/engine/resources/openstack/heat/structured_config.py b/heat/engine/resources/openstack/heat/structured_config.py
index 296d731087..836e2ef92a 100644
--- a/heat/engine/resources/openstack/heat/structured_config.py
+++ b/heat/engine/resources/openstack/heat/structured_config.py
@@ -242,7 +242,8 @@ class StructuredDeployments(StructuredDeploymentGroup):
         version='7.0.0',
         previous_status=support.SupportStatus(
             status=support.DEPRECATED,
-            version='2014.2'))
+            version='2014.2'),
+        substitute_class=StructuredDeploymentGroup)
 
 
 def resource_mapping():