diff --git a/cfn-templates/cid-cfn.tests.bats b/cfn-templates/cid-cfn.tests.bats
index 5a151cf8..889bd503 100644
--- a/cfn-templates/cid-cfn.tests.bats
+++ b/cfn-templates/cid-cfn.tests.bats
@@ -69,7 +69,7 @@ setup_file() {
       QuickSightUser="$quicksight_user"\
       CURBucketPath="s3://$cur_bucket/$cur_prefix/$cur_name/$cur_name"\
       CURIsManagedByCloudFormation="yes"\
-      CostOptimizationDataCollectionBucketPath="s3://costoptimizationdata{account_id}"\
+      CostOptimizationDataCollectionBucketPath="s3://cid-data-{account_id}"\
       DeployCUDOSDashboard="yes"\
       DeployComputeOptimizerDashboard="no"\
       DeployCostIntelligenceDashboard="yes"\
diff --git a/cid/builtin/core/data/resources.yaml b/cid/builtin/core/data/resources.yaml
index cb820019..ea07935a 100644
--- a/cid/builtin/core/data/resources.yaml
+++ b/cid/builtin/core/data/resources.yaml
@@ -528,7 +528,7 @@ views:
     File: tao/glue_table.json
     parameters:
       s3FolderPath:
-        default: 's3://costoptimizationdata{account_id}/trusted-advisor/trusted-advisor-data'
+        default: 's3://cid-data-{account_id}/trusted-advisor/trusted-advisor-data'
         description: Trusted Advisor Organization View report S3 path
   ta_org_view:
     File: tao/ta_org_view.sql
diff --git a/cid/test/bats/10-deploy-update-delete/compute-optimizer-dashboard.bats b/cid/test/bats/10-deploy-update-delete/compute-optimizer-dashboard.bats
index ad53a520..1544cb2e 100644
--- a/cid/test/bats/10-deploy-update-delete/compute-optimizer-dashboard.bats
+++ b/cid/test/bats/10-deploy-update-delete/compute-optimizer-dashboard.bats
@@ -7,10 +7,10 @@ account_id=$(aws sts get-caller-identity --query "Account" --output text )
     --dashboard-id compute-optimizer-dashboard \
     --share-with-account \
     --athena-database 'optimization_data' \
-    --view-compute-optimizer-lambda-lines-s3FolderPath       's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_lambda' \
-    --view-compute-optimizer-ebs-volume-lines-s3FolderPath   's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ebs_volume' \
-    --view-compute-optimizer-auto-scale-lines-s3FolderPath   's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_auto_scale' \
-    --view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_instance'
+    --view-compute-optimizer-lambda-lines-s3FolderPath       's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_lambda' \
+    --view-compute-optimizer-ebs-volume-lines-s3FolderPath   's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ebs_volume' \
+    --view-compute-optimizer-auto-scale-lines-s3FolderPath   's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_auto_scale' \
+    --view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_instance'
 
   [ "$status" -eq 0 ]
 }
@@ -43,10 +43,10 @@ account_id=$(aws sts get-caller-identity --query "Account" --output text )
 @test "Update works" {
   run cid-cmd -vv --yes update --force --recursive  \
     --dashboard-id compute-optimizer-dashboard \
-    --view-compute-optimizer-lambda-lines-s3FolderPath       's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_lambda' \
-    --view-compute-optimizer-ebs-volume-lines-s3FolderPath   's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ebs_volume' \
-    --view-compute-optimizer-auto-scale-lines-s3FolderPath   's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_auto_scale' \
-    --view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_instance'
+    --view-compute-optimizer-lambda-lines-s3FolderPath       's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_lambda' \
+    --view-compute-optimizer-ebs-volume-lines-s3FolderPath   's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ebs_volume' \
+    --view-compute-optimizer-auto-scale-lines-s3FolderPath   's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_auto_scale' \
+    --view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_instance'
 
   [ "$status" -eq 0 ]
   echo "$output" | grep 'Update completed'
diff --git a/cid/test/bats/10-deploy-update-delete/ta-organizational-view.bats b/cid/test/bats/10-deploy-update-delete/ta-organizational-view.bats
index bdc59d12..c461a2c6 100644
--- a/cid/test/bats/10-deploy-update-delete/ta-organizational-view.bats
+++ b/cid/test/bats/10-deploy-update-delete/ta-organizational-view.bats
@@ -8,7 +8,7 @@ account_id=$(aws sts get-caller-identity --query "Account" --output text )
     --athena-database 'optimization_data' \
     --share-with-account \
 
-    --view-ta-organizational-view-reports-s3FolderPath "s3://costoptimizationdata$account_id/optics-data-collector/ta-data'"
+    --view-ta-organizational-view-reports-s3FolderPath "s3://cid-data-$account_id/optics-data-collector/ta-data'"
 
   [ "$status" -eq 0 ]
 }
@@ -41,7 +41,7 @@ account_id=$(aws sts get-caller-identity --query "Account" --output text )
 @test "Update works" {
   run cid-cmd -vv --yes update --force --recursive  \
     --dashboard-id ta-organizational-view \
-    --view-ta-organizational-view-reports-s3FolderPath "s3://costoptimizationdata$account_id)/optics-data-collector/ta-data"
+    --view-ta-organizational-view-reports-s3FolderPath "s3://cid-data-$account_id)/optics-data-collector/ta-data"
 
   [ "$status" -eq 0 ]
   echo "$output" | grep 'Update completed'