diff --git a/orm/services/resource_distributor/rds/services/yaml_image_builder.py b/orm/services/resource_distributor/rds/services/yaml_image_builder.py
index f83f64b7..70ea7e7d 100755
--- a/orm/services/resource_distributor/rds/services/yaml_image_builder.py
+++ b/orm/services/resource_distributor/rds/services/yaml_image_builder.py
@@ -20,7 +20,7 @@ def create_full_yaml(title, resources, description, outputs):
 def _properties(alldata, region):
     public = alldata['visibility']
     protected = {0: False, 1: True}[alldata['protected']]
-    tenants = [tenant['customer_id'] for tenant in alldata['customers']]
+    members = [member['customer_id'] for member in alldata['customers']]
     properties = dict(
         name=alldata['name'],
         container_format=alldata["container_format"],
@@ -36,7 +36,7 @@ def _properties(alldata, region):
     )
 
     if region['action'] != 'create':
-        properties['deactivate'] = {1: False, 0: True}[alldata['enabled']]
+        properties['active'] = {0: False, 1: True}[alldata['enabled']]
 
     if alldata['properties']:
         properties['extra_properties'] = alldata['properties']
diff --git a/orm/tests/unit/rds/services/test_image_yaml.py b/orm/tests/unit/rds/services/test_image_yaml.py
index a5d414e3..ff70c344 100755
--- a/orm/tests/unit/rds/services/test_image_yaml.py
+++ b/orm/tests/unit/rds/services/test_image_yaml.py
@@ -45,7 +45,7 @@ yaml_output = {
                 'container_format': 'bare', 'disk_format': 'raw',
                 'visibility': 'public',
                 'location': 'https://mirrors.it.att.com/images/image-name',
-                'deactivate': False,
+                'active': True,
                 'min_disk': 2, 'min_ram': 0, 'name': 'Ubuntu', 'owner': 'unknown',
                 'protected': True,
                 'id': '12345678-9012-3456-7890-123456789012',