diff --git a/lib/OpenCloud/Orchestration/Resource/ResourceType.php b/lib/OpenCloud/Orchestration/Resource/ResourceType.php
index 1d8717af7..4f6a81bf9 100644
--- a/lib/OpenCloud/Orchestration/Resource/ResourceType.php
+++ b/lib/OpenCloud/Orchestration/Resource/ResourceType.php
@@ -33,25 +33,13 @@ class ResourceType extends ReadOnlyResource
 
     protected $resourceType;
     protected $attributes;
-    protected $_properties; // Named so because the Base class has a $properties member.
+    protected $resourceTypeProperties; // Named so because the Base class has a $properties member.
 
     protected $aliases = array(
-        'resource_type' => 'resourceType'
+        'resource_type' => 'resourceType',
+        'properties'    => 'resourceTypeProperties'
     );
 
-    /**
-     * Required to prevent the Base class from attempting to populate $this->properties.
-     */
-    protected function setProperties($properties)
-    {
-        $this->_properties = $properties;
-    }
-
-    public function getProperties()
-    {
-        return $this->_properties;
-    }
-
     /**
      * Returns the template representation for this resource type.
      *
diff --git a/lib/OpenCloud/Orchestration/Resource/Stack.php b/lib/OpenCloud/Orchestration/Resource/Stack.php
index 8e053aed4..53162b1ec 100644
--- a/lib/OpenCloud/Orchestration/Resource/Stack.php
+++ b/lib/OpenCloud/Orchestration/Resource/Stack.php
@@ -31,6 +31,7 @@ class Stack extends PersistentResource
     protected static $json_name = 'stack';
 
     protected $id;
+    protected $parentStack; // Named so because the Base class has a $parent member.
     protected $disableRollback;
     protected $description;
     protected $parameters;
@@ -49,6 +50,7 @@ class Stack extends PersistentResource
     protected $links;
 
     protected $aliases = array(
+        'parent'              => 'parentStack',
         'disable_rollback'    => 'disableRollback',
         'stack_name'          => 'name',
         'stack_status'        => 'status',
diff --git a/tests/OpenCloud/Smoke/Unit/Orchestration.php b/tests/OpenCloud/Smoke/Unit/Orchestration.php
index 425526468..57ee8223b 100644
--- a/tests/OpenCloud/Smoke/Unit/Orchestration.php
+++ b/tests/OpenCloud/Smoke/Unit/Orchestration.php
@@ -198,6 +198,7 @@ public function main()
         $this->stepInfo('Abandon stack data: %s ', $abandonedStackData);
 
         $this->step('Adopt stack');
+        sleep(10); // For abandoned stack to get deleted.
         $stack = $this->getService()->adoptStack(array(
             'name'       => 'simple-lamp-setup-from-template-url',
             'templateUrl' => 'https://raw.githubusercontent.com/rackspace-orchestration-templates/lamp/master/lamp.yaml',