diff --git a/terraform/azure_0DIN/finops.tf b/terraform/azure_0DIN/finops.tf
index c8fad9a3..c09e22cf 100644
--- a/terraform/azure_0DIN/finops.tf
+++ b/terraform/azure_0DIN/finops.tf
@@ -1,6 +1,6 @@
-resource "azapi_resource" "azure_zero_din_cost_export_actual" {
+resource "azapi_resource" "zero_din_cost_export_actual" {
   type      = "Microsoft.CostManagement/exports@2025-03-01"
-  name      = "azure_0din_actual"
+  name      = "0din_actual"
   parent_id = "/subscriptions/e1cb04e4-3788-471a-881f-385e66ad80ab"
 
   body = {
@@ -19,7 +19,7 @@ resource "azapi_resource" "azure_zero_din_cost_export_actual" {
         destination = {
           resourceId     = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
           container      = "cost-management"
-          rootFolderPath = "azure_0din_daily_actual"
+          rootFolderPath = "0din"
         }
       }
       partitionData = true
@@ -34,9 +34,9 @@ resource "azapi_resource" "azure_zero_din_cost_export_actual" {
   }
 }
 
-resource "azapi_resource" "azure_zero_din_cost_export_amortized" {
+resource "azapi_resource" "zero_din_cost_export_amortized" {
   type      = "Microsoft.CostManagement/exports@2025-03-01"
-  name      = "azure_0din_amortized"
+  name      = "0din_amortized"
   parent_id = "/subscriptions/e1cb04e4-3788-471a-881f-385e66ad80ab"
 
   body = {
@@ -55,7 +55,7 @@ resource "azapi_resource" "azure_zero_din_cost_export_amortized" {
         destination = {
           resourceId     = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
           container      = "cost-management"
-          rootFolderPath = "azure_0din_daily_amortized"
+          rootFolderPath = "0din"
         }
       }
       partitionData = true
diff --git a/terraform/azure_fx_nonci/.finops.tf.swp b/terraform/azure_fx_nonci/.finops.tf.swp
deleted file mode 100644
index af813900..00000000
Binary files a/terraform/azure_fx_nonci/.finops.tf.swp and /dev/null differ
diff --git a/terraform/azure_fx_nonci/finops.tf b/terraform/azure_fx_nonci/finops.tf
index 130ca4d7..7325c152 100644
--- a/terraform/azure_fx_nonci/finops.tf
+++ b/terraform/azure_fx_nonci/finops.tf
@@ -1,6 +1,6 @@
-resource "azapi_resource" "azure_infrasec_cost_export_actual" {
+resource "azapi_resource" "fx_non_ci_cost_export_actual" {
   type      = "Microsoft.CostManagement/exports@2025-03-01"
-  name      = "azure-firefox-nonci_actual"
+  name      = "fx_non_ci_actual"
   parent_id = "/subscriptions/0a420ff9-bc77-4475-befc-a05071fc92ec"
 
   body = {
@@ -19,7 +19,7 @@ resource "azapi_resource" "azure_infrasec_cost_export_actual" {
         destination = {
           resourceId     = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
           container      = "cost-management"
-          rootFolderPath = "azure_firefox_nonci_daily_actual"
+          rootFolderPath = "fx_non_ci"
         }
       }
       partitionData = true
@@ -34,9 +34,9 @@ resource "azapi_resource" "azure_infrasec_cost_export_actual" {
   }
 }
 
-resource "azapi_resource" "azure_infrasec_cost_export_amortized" {
+resource "azapi_resource" "fx_non_ci_cost_export_amortized" {
   type      = "Microsoft.CostManagement/exports@2025-03-01"
-  name      = "azure-firefox-nonci_amortized"
+  name      = "fx_non_ci_amortized"
   parent_id = "/subscriptions/0a420ff9-bc77-4475-befc-a05071fc92ec"
 
   body = {
@@ -55,7 +55,7 @@ resource "azapi_resource" "azure_infrasec_cost_export_amortized" {
         destination = {
           resourceId     = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
           container      = "cost-management"
-          rootFolderPath = "azure_firefox_nonci_daily_amortized"
+          rootFolderPath = "fx_non_ci"
         }
       }
       partitionData = true
diff --git a/terraform/azure_infrasec/finops.tf b/terraform/azure_infrasec/finops.tf
index ecaf17e5..d34fafcc 100644
--- a/terraform/azure_infrasec/finops.tf
+++ b/terraform/azure_infrasec/finops.tf
@@ -1,7 +1,7 @@
 ## Azure Cost Exports for Azure Infrastructure Security Subscription
-resource "azapi_resource" "azure_infrasec_cost_export_actual" {
+resource "azapi_resource" "infrasec_cost_export_actual" {
   type      = "Microsoft.CostManagement/exports@2025-03-01"
-  name      = "azure-infrasec_actual"
+  name      = "infrasec_actual"
   parent_id = "/subscriptions/9b9774fb-67f1-45b7-830f-aafe07a94396"
 
   body = {
@@ -20,7 +20,7 @@ resource "azapi_resource" "azure_infrasec_cost_export_actual" {
         destination = {
           resourceId     = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
           container      = "cost-management"
-          rootFolderPath = "azure_infrasec_daily_actual"
+          rootFolderPath = "infrasec"
         }
       }
       partitionData = true
@@ -35,9 +35,9 @@ resource "azapi_resource" "azure_infrasec_cost_export_actual" {
   }
 }
 
-resource "azapi_resource" "azure_infrasec_cost_export_amortized" {
+resource "azapi_resource" "infrasec_cost_export_amortized" {
   type      = "Microsoft.CostManagement/exports@2025-03-01"
-  name      = "azure-infrasec_amortized"
+  name      = "infrasec_amortized"
   parent_id = "/subscriptions/9b9774fb-67f1-45b7-830f-aafe07a94396"
 
   body = {
@@ -56,7 +56,7 @@ resource "azapi_resource" "azure_infrasec_cost_export_amortized" {
         destination = {
           resourceId     = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
           container      = "cost-management"
-          rootFolderPath = "azure_infrasec_daily_amortized"
+          rootFolderPath = "infrasec"
         }
       }
       partitionData = true
diff --git a/terraform/azure_tceng/finops.tf b/terraform/azure_tceng/finops.tf
index ca106ab2..25ad9631 100644
--- a/terraform/azure_tceng/finops.tf
+++ b/terraform/azure_tceng/finops.tf
@@ -1,6 +1,6 @@
-resource "azapi_resource" "azure_tceng_cost_export_actual" {
+resource "azapi_resource" "tceng_cost_export_actual" {
   type      = "Microsoft.CostManagement/exports@2025-03-01"
-  name      = "azure-tceng_actual"
+  name      = "taskcluster-daily_actual"
   parent_id = "/subscriptions/8a205152-b25a-417f-a676-80465535a6c9"
 
   body = {
@@ -19,7 +19,7 @@ resource "azapi_resource" "azure_tceng_cost_export_actual" {
         destination = {
           resourceId     = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
           container      = "cost-management"
-          rootFolderPath = "azure_tceng_daily_actual"
+          rootFolderPath = "taskcluster"
         }
       }
       partitionData = true
@@ -34,9 +34,9 @@ resource "azapi_resource" "azure_tceng_cost_export_actual" {
   }
 }
 
-resource "azapi_resource" "azure_tceng_cost_export_amortized" {
+resource "azapi_resource" "tceng_cost_export_amortized" {
   type      = "Microsoft.CostManagement/exports@2025-03-01"
-  name      = "azure-tceng_amortized"
+  name      = "taskcluster-daily_amortized"
   parent_id = "/subscriptions/8a205152-b25a-417f-a676-80465535a6c9"
 
   body = {
@@ -55,7 +55,7 @@ resource "azapi_resource" "azure_tceng_cost_export_amortized" {
         destination = {
           resourceId     = "/subscriptions/108d46d5-fe9b-4850-9a7d-8c914aa6c1f0/resourceGroups/rg-azure-cost-mgmt/providers/Microsoft.Storage/storageAccounts/safinopsdata"
           container      = "cost-management"
-          rootFolderPath = "azure_tceng_daily_amortized"
+          rootFolderPath = "taskcluster"
         }
       }
       partitionData = true