diff --git a/.env-dist b/.env-dist
index c6a6a81..b404e9f 100644
--- a/.env-dist
+++ b/.env-dist
@@ -3,10 +3,8 @@ CONNECTION_TIMEOUT=
 AWS_PROFILE=
 DRY_RUN=
 ENABLE_CLOUDWATCH_INTEGRATION=
-CLOUDWATCH_CUSTOMER_DIFFERENCE_METRIC_NAME=
 CLOUDWATCH_SPACE_DIFFERENCE_METRIC_NAME=
 CLOUDWATCH_SPACE_DELETE_METRIC_NAME=
-CLOUDWATCH_CUSTOMER_DELETE_METRIC_NAME=
 CLOUDWATCH_SPACE_IMAGE_SIZE_DIFFERENCE_METRIC_NAME=
 CLOUDWATCH_SPACE_IMAGE_NUMBER_DIFFERENCE_METRIC_NAME=
 CLOUDWATCH_SPACE_THUMBNAIL_SIZE_DIFFERENCE_METRIC_NAME=
diff --git a/src/customer_storage_recalculator.py b/src/customer_storage_recalculator.py
index 00eb7b5..e1ca229 100644
--- a/src/customer_storage_recalculator.py
+++ b/src/customer_storage_recalculator.py
@@ -35,7 +35,7 @@ def begin_cleanup():
 def set_cloudwatch_metrics(records, cloudwatch, connection_info):
     metric_data = []
     dimensions = [{
-                    'Name': "TABLE_NAME",
+                    'Name': "DATABASE_NAME",
                     'Value': connection_info["database"]
                 },
                 {
@@ -61,19 +61,19 @@ def set_cloudwatch_metrics(records, cloudwatch, connection_info):
         {
             'MetricName': CLOUDWATCH_SPACE_IMAGE_SIZE_DIFFERENCE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Bytes',
             'Value': space_total_image_size_delta
         },
         {
             'MetricName': CLOUDWATCH_SPACE_IMAGE_NUMBER_DIFFERENCE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Count',
             'Value': space_total_image_number_delta
         },
         {
             'MetricName': CLOUDWATCH_SPACE_THUMBNAIL_SIZE_DIFFERENCE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Bytes',
             'Value': space_total_thumbnail_size_delta
         }
     ])
@@ -81,7 +81,7 @@ def set_cloudwatch_metrics(records, cloudwatch, connection_info):
     try:
         logger.debug(f"updating cloudwatch metrics - {metric_data}")
         cloudwatch.put_metric_data(MetricData=metric_data,
-                                   Namespace='Entity Counter Recalculator')
+                                   Namespace='Protagonist Recalculator')
         return metric_data
     except Exception as e:
         logger.error(f"Error posting to cloudwatch: {e}")
diff --git a/src/entity_counter_recalculator.py b/src/entity_counter_recalculator.py
index 18765fd..be0a733 100644
--- a/src/entity_counter_recalculator.py
+++ b/src/entity_counter_recalculator.py
@@ -35,7 +35,7 @@ def begin_cleanup():
 def set_cloudwatch_metrics(records, cloudwatch, connection_info):
     metric_data = []
     dimensions = [{
-                    'Name': "TABLE_NAME",
+                    'Name': "DATABASE_NAME",
                     'Value': connection_info["database"]
                 },
                 {
@@ -61,13 +61,13 @@ def set_cloudwatch_metrics(records, cloudwatch, connection_info):
         {
             'MetricName': CLOUDWATCH_SPACE_DIFFERENCE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Count',
             'Value': space_delta
         },
         {
             'MetricName': CLOUDWATCH_SPACE_DELETE_METRIC_NAME,
             'Dimensions': dimensions,
-            'Unit': 'None',
+            'Unit': 'Count',
             'Value': space_deletes_needed
         }
     ])
@@ -75,7 +75,7 @@ def set_cloudwatch_metrics(records, cloudwatch, connection_info):
     try:
         logger.debug(f"updating cloudwatch metrics - {metric_data}")
         cloudwatch.put_metric_data(MetricData=metric_data,
-                                   Namespace='Entity Counter Recalculator')
+                                   Namespace='Protagonist Recalculator')
         return metric_data
     except Exception as e:
         logger.error(f"Error posting to cloudwatch: {e}")