diff --git a/datasets/austin_bikeshare/_terraform/bikeshare_stations_pipeline.tf b/datasets/austin_bikeshare/_terraform/bikeshare_stations_pipeline.tf
index 54c5e78d6..c050413a7 100644
--- a/datasets/austin_bikeshare/_terraform/bikeshare_stations_pipeline.tf
+++ b/datasets/austin_bikeshare/_terraform/bikeshare_stations_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "bikeshare_stations" {
+resource "google_bigquery_table" "austin_bikeshare_bikeshare_stations" {
   project    = var.project_id
   dataset_id = "austin_bikeshare"
   table_id   = "bikeshare_stations"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "bikeshare_stations" {
   ]
 }
 
-output "bigquery_table-bikeshare_stations-table_id" {
-  value = google_bigquery_table.bikeshare_stations.table_id
+output "bigquery_table-austin_bikeshare_bikeshare_stations-table_id" {
+  value = google_bigquery_table.austin_bikeshare_bikeshare_stations.table_id
 }
 
-output "bigquery_table-bikeshare_stations-id" {
-  value = google_bigquery_table.bikeshare_stations.id
+output "bigquery_table-austin_bikeshare_bikeshare_stations-id" {
+  value = google_bigquery_table.austin_bikeshare_bikeshare_stations.id
 }
diff --git a/datasets/austin_crime/_terraform/crime_pipeline.tf b/datasets/austin_crime/_terraform/crime_pipeline.tf
index a2d834e8c..827647247 100644
--- a/datasets/austin_crime/_terraform/crime_pipeline.tf
+++ b/datasets/austin_crime/_terraform/crime_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "crime" {
+resource "google_bigquery_table" "austin_crime_crime" {
   project    = var.project_id
   dataset_id = "austin_crime"
   table_id   = "crime"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "crime" {
   ]
 }
 
-output "bigquery_table-crime-table_id" {
-  value = google_bigquery_table.crime.table_id
+output "bigquery_table-austin_crime_crime-table_id" {
+  value = google_bigquery_table.austin_crime_crime.table_id
 }
 
-output "bigquery_table-crime-id" {
-  value = google_bigquery_table.crime.id
+output "bigquery_table-austin_crime_crime-id" {
+  value = google_bigquery_table.austin_crime_crime.id
 }
diff --git a/datasets/bls/_terraform/cpsaat18_pipeline.tf b/datasets/bls/_terraform/cpsaat18_pipeline.tf
index ee26b2c32..cd59682d4 100644
--- a/datasets/bls/_terraform/cpsaat18_pipeline.tf
+++ b/datasets/bls/_terraform/cpsaat18_pipeline.tf
@@ -15,22 +15,25 @@
  */
 
 
-resource "google_bigquery_table" "cpsaat18" {
+resource "google_bigquery_table" "bls_cpsaat18" {
   project    = var.project_id
   dataset_id = "bls"
   table_id   = "cpsaat18"
 
   description = "Current population survey 18: Employed persons by detailed industry, sex, race, and Hispanic or Latino ethnicity"
 
+
+
+
   depends_on = [
     google_bigquery_dataset.bls
   ]
 }
 
-output "bigquery_table-cpsaat18-table_id" {
-  value = google_bigquery_table.cpsaat18.table_id
+output "bigquery_table-bls_cpsaat18-table_id" {
+  value = google_bigquery_table.bls_cpsaat18.table_id
 }
 
-output "bigquery_table-cpsaat18-id" {
-  value = google_bigquery_table.cpsaat18.id
+output "bigquery_table-bls_cpsaat18-id" {
+  value = google_bigquery_table.bls_cpsaat18.id
 }
diff --git a/datasets/covid19_google_mobility/_terraform/mobility_report_pipeline.tf b/datasets/covid19_google_mobility/_terraform/mobility_report_pipeline.tf
index 30414bb72..e559b743b 100644
--- a/datasets/covid19_google_mobility/_terraform/mobility_report_pipeline.tf
+++ b/datasets/covid19_google_mobility/_terraform/mobility_report_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "mobility_report" {
+resource "google_bigquery_table" "covid19_google_mobility_mobility_report" {
   project    = var.project_id
   dataset_id = "covid19_google_mobility"
   table_id   = "mobility_report"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "mobility_report" {
   ]
 }
 
-output "bigquery_table-mobility_report-table_id" {
-  value = google_bigquery_table.mobility_report.table_id
+output "bigquery_table-covid19_google_mobility_mobility_report-table_id" {
+  value = google_bigquery_table.covid19_google_mobility_mobility_report.table_id
 }
 
-output "bigquery_table-mobility_report-id" {
-  value = google_bigquery_table.mobility_report.id
+output "bigquery_table-covid19_google_mobility_mobility_report-id" {
+  value = google_bigquery_table.covid19_google_mobility_mobility_report.id
 }
diff --git a/datasets/covid19_italy/_terraform/data_by_province_pipeline.tf b/datasets/covid19_italy/_terraform/data_by_province_pipeline.tf
index f7a11bb93..5b9335eee 100644
--- a/datasets/covid19_italy/_terraform/data_by_province_pipeline.tf
+++ b/datasets/covid19_italy/_terraform/data_by_province_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "data_by_province" {
+resource "google_bigquery_table" "covid19_italy_data_by_province" {
   project    = var.project_id
   dataset_id = "covid19_italy"
   table_id   = "data_by_province"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "data_by_province" {
   ]
 }
 
-output "bigquery_table-data_by_province-table_id" {
-  value = google_bigquery_table.data_by_province.table_id
+output "bigquery_table-covid19_italy_data_by_province-table_id" {
+  value = google_bigquery_table.covid19_italy_data_by_province.table_id
 }
 
-output "bigquery_table-data_by_province-id" {
-  value = google_bigquery_table.data_by_province.id
+output "bigquery_table-covid19_italy_data_by_province-id" {
+  value = google_bigquery_table.covid19_italy_data_by_province.id
 }
diff --git a/datasets/covid19_italy/_terraform/data_by_region_pipeline.tf b/datasets/covid19_italy/_terraform/data_by_region_pipeline.tf
index 42f52d7c6..4ff8e6612 100644
--- a/datasets/covid19_italy/_terraform/data_by_region_pipeline.tf
+++ b/datasets/covid19_italy/_terraform/data_by_region_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "data_by_region" {
+resource "google_bigquery_table" "covid19_italy_data_by_region" {
   project    = var.project_id
   dataset_id = "covid19_italy"
   table_id   = "data_by_region"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "data_by_region" {
   ]
 }
 
-output "bigquery_table-data_by_region-table_id" {
-  value = google_bigquery_table.data_by_region.table_id
+output "bigquery_table-covid19_italy_data_by_region-table_id" {
+  value = google_bigquery_table.covid19_italy_data_by_region.table_id
 }
 
-output "bigquery_table-data_by_region-id" {
-  value = google_bigquery_table.data_by_region.id
+output "bigquery_table-covid19_italy_data_by_region-id" {
+  value = google_bigquery_table.covid19_italy_data_by_region.id
 }
diff --git a/datasets/covid19_italy/_terraform/national_trends_pipeline.tf b/datasets/covid19_italy/_terraform/national_trends_pipeline.tf
index 1a9a64c7f..101c293e2 100644
--- a/datasets/covid19_italy/_terraform/national_trends_pipeline.tf
+++ b/datasets/covid19_italy/_terraform/national_trends_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "national_trends" {
+resource "google_bigquery_table" "covid19_italy_national_trends" {
   project    = var.project_id
   dataset_id = "covid19_italy"
   table_id   = "national_trends"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "national_trends" {
   ]
 }
 
-output "bigquery_table-national_trends-table_id" {
-  value = google_bigquery_table.national_trends.table_id
+output "bigquery_table-covid19_italy_national_trends-table_id" {
+  value = google_bigquery_table.covid19_italy_national_trends.table_id
 }
 
-output "bigquery_table-national_trends-id" {
-  value = google_bigquery_table.national_trends.id
+output "bigquery_table-covid19_italy_national_trends-id" {
+  value = google_bigquery_table.covid19_italy_national_trends.id
 }
diff --git a/datasets/covid19_vaccination_access/_terraform/vaccination_access_to_bq_pipeline.tf b/datasets/covid19_vaccination_access/_terraform/vaccination_access_to_bq_pipeline.tf
index edae296f8..bedf06498 100644
--- a/datasets/covid19_vaccination_access/_terraform/vaccination_access_to_bq_pipeline.tf
+++ b/datasets/covid19_vaccination_access/_terraform/vaccination_access_to_bq_pipeline.tf
@@ -15,82 +15,94 @@
  */
 
 
-resource "google_bigquery_table" "facility_boundary_us_all" {
+resource "google_bigquery_table" "covid19_vaccination_access_facility_boundary_us_all" {
   project    = var.project_id
   dataset_id = "covid19_vaccination_access"
   table_id   = "facility_boundary_us_all"
 
   description = "This table is formed by combining the data from the individual US tables of drive, transit and walk. It represents the boundaries of areas surrounding vaccination facilities from which people can reach the facility within certain duration. It is computed for 3 travel modes of drive, transit and walk and for predetermined time periods."
 
+
+
+
   depends_on = [
     google_bigquery_dataset.covid19_vaccination_access
   ]
 }
 
-output "bigquery_table-facility_boundary_us_all-table_id" {
-  value = google_bigquery_table.facility_boundary_us_all.table_id
+output "bigquery_table-covid19_vaccination_access_facility_boundary_us_all-table_id" {
+  value = google_bigquery_table.covid19_vaccination_access_facility_boundary_us_all.table_id
 }
 
-output "bigquery_table-facility_boundary_us_all-id" {
-  value = google_bigquery_table.facility_boundary_us_all.id
+output "bigquery_table-covid19_vaccination_access_facility_boundary_us_all-id" {
+  value = google_bigquery_table.covid19_vaccination_access_facility_boundary_us_all.id
 }
 
-resource "google_bigquery_table" "facility_boundary_us_drive" {
+resource "google_bigquery_table" "covid19_vaccination_access_facility_boundary_us_drive" {
   project    = var.project_id
   dataset_id = "covid19_vaccination_access"
   table_id   = "facility_boundary_us_drive"
 
   description = "This table represents the boundaries of areas surrounding vaccination facilities from which people can reach the facility by driving within predetermined time periods."
 
+
+
+
   depends_on = [
     google_bigquery_dataset.covid19_vaccination_access
   ]
 }
 
-output "bigquery_table-facility_boundary_us_drive-table_id" {
-  value = google_bigquery_table.facility_boundary_us_drive.table_id
+output "bigquery_table-covid19_vaccination_access_facility_boundary_us_drive-table_id" {
+  value = google_bigquery_table.covid19_vaccination_access_facility_boundary_us_drive.table_id
 }
 
-output "bigquery_table-facility_boundary_us_drive-id" {
-  value = google_bigquery_table.facility_boundary_us_drive.id
+output "bigquery_table-covid19_vaccination_access_facility_boundary_us_drive-id" {
+  value = google_bigquery_table.covid19_vaccination_access_facility_boundary_us_drive.id
 }
 
-resource "google_bigquery_table" "facility_boundary_us_transit" {
+resource "google_bigquery_table" "covid19_vaccination_access_facility_boundary_us_transit" {
   project    = var.project_id
   dataset_id = "covid19_vaccination_access"
   table_id   = "facility_boundary_us_transit"
 
   description = "This table represents the boundaries of areas surrounding vaccination facilities from which people can reach the facility by public transit within predetermined time periods."
 
+
+
+
   depends_on = [
     google_bigquery_dataset.covid19_vaccination_access
   ]
 }
 
-output "bigquery_table-facility_boundary_us_transit-table_id" {
-  value = google_bigquery_table.facility_boundary_us_transit.table_id
+output "bigquery_table-covid19_vaccination_access_facility_boundary_us_transit-table_id" {
+  value = google_bigquery_table.covid19_vaccination_access_facility_boundary_us_transit.table_id
 }
 
-output "bigquery_table-facility_boundary_us_transit-id" {
-  value = google_bigquery_table.facility_boundary_us_transit.id
+output "bigquery_table-covid19_vaccination_access_facility_boundary_us_transit-id" {
+  value = google_bigquery_table.covid19_vaccination_access_facility_boundary_us_transit.id
 }
 
-resource "google_bigquery_table" "facility_boundary_us_walk" {
+resource "google_bigquery_table" "covid19_vaccination_access_facility_boundary_us_walk" {
   project    = var.project_id
   dataset_id = "covid19_vaccination_access"
   table_id   = "facility_boundary_us_walk"
 
   description = "This table represents the boundaries of areas surrounding vaccination facilities from which people can reach the facility by walking within predetermined time periods."
 
+
+
+
   depends_on = [
     google_bigquery_dataset.covid19_vaccination_access
   ]
 }
 
-output "bigquery_table-facility_boundary_us_walk-table_id" {
-  value = google_bigquery_table.facility_boundary_us_walk.table_id
+output "bigquery_table-covid19_vaccination_access_facility_boundary_us_walk-table_id" {
+  value = google_bigquery_table.covid19_vaccination_access_facility_boundary_us_walk.table_id
 }
 
-output "bigquery_table-facility_boundary_us_walk-id" {
-  value = google_bigquery_table.facility_boundary_us_walk.id
+output "bigquery_table-covid19_vaccination_access_facility_boundary_us_walk-id" {
+  value = google_bigquery_table.covid19_vaccination_access_facility_boundary_us_walk.id
 }
diff --git a/datasets/covid19_vaccination_search_insights/_terraform/covid19_vaccination_search_insights_pipeline.tf b/datasets/covid19_vaccination_search_insights/_terraform/covid19_vaccination_search_insights_pipeline.tf
index eee21dc19..1289340fd 100644
--- a/datasets/covid19_vaccination_search_insights/_terraform/covid19_vaccination_search_insights_pipeline.tf
+++ b/datasets/covid19_vaccination_search_insights/_terraform/covid19_vaccination_search_insights_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "covid19_vaccination_search_insights" {
+resource "google_bigquery_table" "covid19_vaccination_search_insights_covid19_vaccination_search_insights" {
   project    = var.project_id
   dataset_id = "covid19_vaccination_search_insights"
   table_id   = "covid19_vaccination_search_insights"
@@ -27,7 +27,8 @@ resource "google_bigquery_table" "covid19_vaccination_search_insights" {
     require_partition_filter = false
   }
   clustering = ["sub_region_1_code", "sub_region_2_code", "sub_region_3_code", "place_id"]
-  schema     = <<EOF
+
+  schema = <<EOF
     [
   {
       "name": "date",
@@ -114,10 +115,10 @@ resource "google_bigquery_table" "covid19_vaccination_search_insights" {
   ]
 }
 
-output "bigquery_table-covid19_vaccination_search_insights-table_id" {
-  value = google_bigquery_table.covid19_vaccination_search_insights.table_id
+output "bigquery_table-covid19_vaccination_search_insights_covid19_vaccination_search_insights-table_id" {
+  value = google_bigquery_table.covid19_vaccination_search_insights_covid19_vaccination_search_insights.table_id
 }
 
-output "bigquery_table-covid19_vaccination_search_insights-id" {
-  value = google_bigquery_table.covid19_vaccination_search_insights.id
+output "bigquery_table-covid19_vaccination_search_insights_covid19_vaccination_search_insights-id" {
+  value = google_bigquery_table.covid19_vaccination_search_insights_covid19_vaccination_search_insights.id
 }
diff --git a/datasets/google_cloud_release_notes/_terraform/release_notes_pipeline.tf b/datasets/google_cloud_release_notes/_terraform/release_notes_pipeline.tf
index 74a42c186..6c700c5da 100644
--- a/datasets/google_cloud_release_notes/_terraform/release_notes_pipeline.tf
+++ b/datasets/google_cloud_release_notes/_terraform/release_notes_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "release_notes" {
+resource "google_bigquery_table" "google_cloud_release_notes_release_notes" {
   project    = var.project_id
   dataset_id = "google_cloud_release_notes"
   table_id   = "release_notes"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "release_notes" {
   ]
 }
 
-output "bigquery_table-release_notes-table_id" {
-  value = google_bigquery_table.release_notes.table_id
+output "bigquery_table-google_cloud_release_notes_release_notes-table_id" {
+  value = google_bigquery_table.google_cloud_release_notes_release_notes.table_id
 }
 
-output "bigquery_table-release_notes-id" {
-  value = google_bigquery_table.release_notes.id
+output "bigquery_table-google_cloud_release_notes_release_notes-id" {
+  value = google_bigquery_table.google_cloud_release_notes_release_notes.id
 }
diff --git a/datasets/google_political_ads/_terraform/advertiser_declared_stats_pipeline.tf b/datasets/google_political_ads/_terraform/advertiser_declared_stats_pipeline.tf
index 06b3353f5..118d9c389 100644
--- a/datasets/google_political_ads/_terraform/advertiser_declared_stats_pipeline.tf
+++ b/datasets/google_political_ads/_terraform/advertiser_declared_stats_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "advertiser_declared_stats" {
+resource "google_bigquery_table" "google_political_ads_advertiser_declared_stats" {
   project    = var.project_id
   dataset_id = "google_political_ads"
   table_id   = "advertiser_declared_stats"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "advertiser_declared_stats" {
   ]
 }
 
-output "bigquery_table-advertiser_declared_stats-table_id" {
-  value = google_bigquery_table.advertiser_declared_stats.table_id
+output "bigquery_table-google_political_ads_advertiser_declared_stats-table_id" {
+  value = google_bigquery_table.google_political_ads_advertiser_declared_stats.table_id
 }
 
-output "bigquery_table-advertiser_declared_stats-id" {
-  value = google_bigquery_table.advertiser_declared_stats.id
+output "bigquery_table-google_political_ads_advertiser_declared_stats-id" {
+  value = google_bigquery_table.google_political_ads_advertiser_declared_stats.id
 }
diff --git a/datasets/google_political_ads/_terraform/advertiser_geo_spend_pipeline.tf b/datasets/google_political_ads/_terraform/advertiser_geo_spend_pipeline.tf
index c5ede9715..46b557ea6 100644
--- a/datasets/google_political_ads/_terraform/advertiser_geo_spend_pipeline.tf
+++ b/datasets/google_political_ads/_terraform/advertiser_geo_spend_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "advertiser_geo_spend" {
+resource "google_bigquery_table" "google_political_ads_advertiser_geo_spend" {
   project    = var.project_id
   dataset_id = "google_political_ads"
   table_id   = "advertiser_geo_spend"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "advertiser_geo_spend" {
   ]
 }
 
-output "bigquery_table-advertiser_geo_spend-table_id" {
-  value = google_bigquery_table.advertiser_geo_spend.table_id
+output "bigquery_table-google_political_ads_advertiser_geo_spend-table_id" {
+  value = google_bigquery_table.google_political_ads_advertiser_geo_spend.table_id
 }
 
-output "bigquery_table-advertiser_geo_spend-id" {
-  value = google_bigquery_table.advertiser_geo_spend.id
+output "bigquery_table-google_political_ads_advertiser_geo_spend-id" {
+  value = google_bigquery_table.google_political_ads_advertiser_geo_spend.id
 }
diff --git a/datasets/google_political_ads/_terraform/advertiser_stats_pipeline.tf b/datasets/google_political_ads/_terraform/advertiser_stats_pipeline.tf
index fea68cc9b..4fdd80d62 100644
--- a/datasets/google_political_ads/_terraform/advertiser_stats_pipeline.tf
+++ b/datasets/google_political_ads/_terraform/advertiser_stats_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "advertiser_stats" {
+resource "google_bigquery_table" "google_political_ads_advertiser_stats" {
   project    = var.project_id
   dataset_id = "google_political_ads"
   table_id   = "advertiser_stats"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "advertiser_stats" {
   ]
 }
 
-output "bigquery_table-advertiser_stats-table_id" {
-  value = google_bigquery_table.advertiser_stats.table_id
+output "bigquery_table-google_political_ads_advertiser_stats-table_id" {
+  value = google_bigquery_table.google_political_ads_advertiser_stats.table_id
 }
 
-output "bigquery_table-advertiser_stats-id" {
-  value = google_bigquery_table.advertiser_stats.id
+output "bigquery_table-google_political_ads_advertiser_stats-id" {
+  value = google_bigquery_table.google_political_ads_advertiser_stats.id
 }
diff --git a/datasets/google_political_ads/_terraform/advertiser_weekly_spend_pipeline.tf b/datasets/google_political_ads/_terraform/advertiser_weekly_spend_pipeline.tf
index 2596d8e77..754fe926c 100644
--- a/datasets/google_political_ads/_terraform/advertiser_weekly_spend_pipeline.tf
+++ b/datasets/google_political_ads/_terraform/advertiser_weekly_spend_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "advertiser_weekly_spend" {
+resource "google_bigquery_table" "google_political_ads_advertiser_weekly_spend" {
   project    = var.project_id
   dataset_id = "google_political_ads"
   table_id   = "advertiser_weekly_spend"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "advertiser_weekly_spend" {
   ]
 }
 
-output "bigquery_table-advertiser_weekly_spend-table_id" {
-  value = google_bigquery_table.advertiser_weekly_spend.table_id
+output "bigquery_table-google_political_ads_advertiser_weekly_spend-table_id" {
+  value = google_bigquery_table.google_political_ads_advertiser_weekly_spend.table_id
 }
 
-output "bigquery_table-advertiser_weekly_spend-id" {
-  value = google_bigquery_table.advertiser_weekly_spend.id
+output "bigquery_table-google_political_ads_advertiser_weekly_spend-id" {
+  value = google_bigquery_table.google_political_ads_advertiser_weekly_spend.id
 }
diff --git a/datasets/google_political_ads/_terraform/campaign_targeting_pipeline.tf b/datasets/google_political_ads/_terraform/campaign_targeting_pipeline.tf
index 573939eb0..b0f3608b2 100644
--- a/datasets/google_political_ads/_terraform/campaign_targeting_pipeline.tf
+++ b/datasets/google_political_ads/_terraform/campaign_targeting_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "campaign_targeting" {
+resource "google_bigquery_table" "google_political_ads_campaign_targeting" {
   project    = var.project_id
   dataset_id = "google_political_ads"
   table_id   = "campaign_targeting"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "campaign_targeting" {
   ]
 }
 
-output "bigquery_table-campaign_targeting-table_id" {
-  value = google_bigquery_table.campaign_targeting.table_id
+output "bigquery_table-google_political_ads_campaign_targeting-table_id" {
+  value = google_bigquery_table.google_political_ads_campaign_targeting.table_id
 }
 
-output "bigquery_table-campaign_targeting-id" {
-  value = google_bigquery_table.campaign_targeting.id
+output "bigquery_table-google_political_ads_campaign_targeting-id" {
+  value = google_bigquery_table.google_political_ads_campaign_targeting.id
 }
diff --git a/datasets/google_political_ads/_terraform/creative_stats_pipeline.tf b/datasets/google_political_ads/_terraform/creative_stats_pipeline.tf
index 1791159a6..e16f16aae 100644
--- a/datasets/google_political_ads/_terraform/creative_stats_pipeline.tf
+++ b/datasets/google_political_ads/_terraform/creative_stats_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "creative_stats" {
+resource "google_bigquery_table" "google_political_ads_creative_stats" {
   project    = var.project_id
   dataset_id = "google_political_ads"
   table_id   = "creative_stats"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "creative_stats" {
   ]
 }
 
-output "bigquery_table-creative_stats-table_id" {
-  value = google_bigquery_table.creative_stats.table_id
+output "bigquery_table-google_political_ads_creative_stats-table_id" {
+  value = google_bigquery_table.google_political_ads_creative_stats.table_id
 }
 
-output "bigquery_table-creative_stats-id" {
-  value = google_bigquery_table.creative_stats.id
+output "bigquery_table-google_political_ads_creative_stats-id" {
+  value = google_bigquery_table.google_political_ads_creative_stats.id
 }
diff --git a/datasets/google_political_ads/_terraform/geo_spend_pipeline.tf b/datasets/google_political_ads/_terraform/geo_spend_pipeline.tf
index f19214dd1..9a9729f21 100644
--- a/datasets/google_political_ads/_terraform/geo_spend_pipeline.tf
+++ b/datasets/google_political_ads/_terraform/geo_spend_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "geo_spend" {
+resource "google_bigquery_table" "google_political_ads_geo_spend" {
   project    = var.project_id
   dataset_id = "google_political_ads"
   table_id   = "geo_spend"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "geo_spend" {
   ]
 }
 
-output "bigquery_table-geo_spend-table_id" {
-  value = google_bigquery_table.geo_spend.table_id
+output "bigquery_table-google_political_ads_geo_spend-table_id" {
+  value = google_bigquery_table.google_political_ads_geo_spend.table_id
 }
 
-output "bigquery_table-geo_spend-id" {
-  value = google_bigquery_table.geo_spend.id
+output "bigquery_table-google_political_ads_geo_spend-id" {
+  value = google_bigquery_table.google_political_ads_geo_spend.id
 }
diff --git a/datasets/google_political_ads/_terraform/last_updated_pipeline.tf b/datasets/google_political_ads/_terraform/last_updated_pipeline.tf
index 372fce7d9..f8ee6b800 100644
--- a/datasets/google_political_ads/_terraform/last_updated_pipeline.tf
+++ b/datasets/google_political_ads/_terraform/last_updated_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "last_updated" {
+resource "google_bigquery_table" "google_political_ads_last_updated" {
   project    = var.project_id
   dataset_id = "google_political_ads"
   table_id   = "last_updated"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "last_updated" {
   ]
 }
 
-output "bigquery_table-last_updated-table_id" {
-  value = google_bigquery_table.last_updated.table_id
+output "bigquery_table-google_political_ads_last_updated-table_id" {
+  value = google_bigquery_table.google_political_ads_last_updated.table_id
 }
 
-output "bigquery_table-last_updated-id" {
-  value = google_bigquery_table.last_updated.id
+output "bigquery_table-google_political_ads_last_updated-id" {
+  value = google_bigquery_table.google_political_ads_last_updated.id
 }
diff --git a/datasets/google_political_ads/_terraform/top_keywords_history_pipeline.tf b/datasets/google_political_ads/_terraform/top_keywords_history_pipeline.tf
index 5acf37b4f..7b0752a48 100644
--- a/datasets/google_political_ads/_terraform/top_keywords_history_pipeline.tf
+++ b/datasets/google_political_ads/_terraform/top_keywords_history_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "top_keywords_history" {
+resource "google_bigquery_table" "google_political_ads_top_keywords_history" {
   project    = var.project_id
   dataset_id = "google_political_ads"
   table_id   = "top_keywords_history"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "top_keywords_history" {
   ]
 }
 
-output "bigquery_table-top_keywords_history-table_id" {
-  value = google_bigquery_table.top_keywords_history.table_id
+output "bigquery_table-google_political_ads_top_keywords_history-table_id" {
+  value = google_bigquery_table.google_political_ads_top_keywords_history.table_id
 }
 
-output "bigquery_table-top_keywords_history-id" {
-  value = google_bigquery_table.top_keywords_history.id
+output "bigquery_table-google_political_ads_top_keywords_history-id" {
+  value = google_bigquery_table.google_political_ads_top_keywords_history.id
 }
diff --git a/datasets/google_trends/_terraform/top_terms_pipeline.tf b/datasets/google_trends/_terraform/top_terms_pipeline.tf
index 5560b317f..4fa9485d4 100644
--- a/datasets/google_trends/_terraform/top_terms_pipeline.tf
+++ b/datasets/google_trends/_terraform/top_terms_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "top_terms" {
+resource "google_bigquery_table" "google_trends_top_terms" {
   project    = var.project_id
   dataset_id = "google_trends"
   table_id   = "top_terms"
@@ -32,10 +32,6 @@ resource "google_bigquery_table" "top_terms" {
 
   schema = <<EOF
     [
-  {
-    "name": "rank",
-    "type": "INTEGER"
-  },
   {
     "name": "refresh_date",
     "type": "DATE"
@@ -59,6 +55,10 @@ resource "google_bigquery_table" "top_terms" {
   {
     "name": "score",
     "type": "INTEGER"
+  },
+  {
+    "name": "rank",
+    "type": "INTEGER"
   }
 ]
     EOF
@@ -67,15 +67,15 @@ resource "google_bigquery_table" "top_terms" {
   ]
 }
 
-output "bigquery_table-top_terms-table_id" {
-  value = google_bigquery_table.top_terms.table_id
+output "bigquery_table-google_trends_top_terms-table_id" {
+  value = google_bigquery_table.google_trends_top_terms.table_id
 }
 
-output "bigquery_table-top_terms-id" {
-  value = google_bigquery_table.top_terms.id
+output "bigquery_table-google_trends_top_terms-id" {
+  value = google_bigquery_table.google_trends_top_terms.id
 }
 
-resource "google_bigquery_table" "top_rising_terms" {
+resource "google_bigquery_table" "google_trends_top_rising_terms" {
   project    = var.project_id
   dataset_id = "google_trends"
   table_id   = "top_rising_terms"
@@ -92,14 +92,6 @@ resource "google_bigquery_table" "top_rising_terms" {
 
   schema = <<EOF
     [
-  {
-    "name": "rank",
-    "type": "INTEGER"
-  },
-  {
-    "name": "refresh_date",
-    "type": "DATE"
-  },
   {
     "name": "dma_name",
     "type": "STRING"
@@ -119,6 +111,18 @@ resource "google_bigquery_table" "top_rising_terms" {
   {
     "name": "score",
     "type": "INTEGER"
+  },
+  {
+    "name": "rank",
+    "type": "INTEGER"
+  },
+  {
+    "name": "percent_gain",
+    "type": "INTEGER"
+  },
+  {
+    "name": "refresh_date",
+    "type": "DATE"
   }
 ]
     EOF
@@ -127,10 +131,10 @@ resource "google_bigquery_table" "top_rising_terms" {
   ]
 }
 
-output "bigquery_table-top_rising_terms-table_id" {
-  value = google_bigquery_table.top_rising_terms.table_id
+output "bigquery_table-google_trends_top_rising_terms-table_id" {
+  value = google_bigquery_table.google_trends_top_rising_terms.table_id
 }
 
-output "bigquery_table-top_rising_terms-id" {
-  value = google_bigquery_table.top_rising_terms.id
+output "bigquery_table-google_trends_top_rising_terms-id" {
+  value = google_bigquery_table.google_trends_top_rising_terms.id
 }
diff --git a/datasets/google_trends/top_terms/pipeline.yaml b/datasets/google_trends/top_terms/pipeline.yaml
index 980cf9784..6190cf089 100644
--- a/datasets/google_trends/top_terms/pipeline.yaml
+++ b/datasets/google_trends/top_terms/pipeline.yaml
@@ -23,10 +23,6 @@ resources:
       require_partition_filter: false
     schema: |-
       [
-        {
-          "name": "rank",
-          "type": "INTEGER"
-        },
         {
           "name": "refresh_date",
           "type": "DATE"
@@ -50,6 +46,10 @@ resources:
         {
           "name": "score",
           "type": "INTEGER"
+        },
+        {
+          "name": "rank",
+          "type": "INTEGER"
         }
       ]
 
@@ -62,14 +62,6 @@ resources:
       require_partition_filter: false
     schema: |-
       [
-        {
-          "name": "rank",
-          "type": "INTEGER"
-        },
-        {
-          "name": "refresh_date",
-          "type": "DATE"
-        },
         {
           "name": "dma_name",
           "type": "STRING"
@@ -89,6 +81,18 @@ resources:
         {
           "name": "score",
           "type": "INTEGER"
+        },
+        {
+          "name": "rank",
+          "type": "INTEGER"
+        },
+        {
+          "name": "percent_gain",
+          "type": "INTEGER"
+        },
+        {
+          "name": "refresh_date",
+          "type": "DATE"
         }
       ]
 
diff --git a/datasets/iowa_liquor_sales/_terraform/iowa_liquor_sales_dataset.tf b/datasets/iowa_liquor_sales/_terraform/iowa_liquor_sales_dataset.tf
index 56ef7f694..67303d856 100644
--- a/datasets/iowa_liquor_sales/_terraform/iowa_liquor_sales_dataset.tf
+++ b/datasets/iowa_liquor_sales/_terraform/iowa_liquor_sales_dataset.tf
@@ -18,7 +18,7 @@
 resource "google_bigquery_dataset" "iowa_liquor_sales" {
   dataset_id  = "iowa_liquor_sales"
   project     = var.project_id
-  description = "This dataset contains every wholesale purchase of liquor in the State of Iowa by retailers for sale to individuals since January 1, 2012. The State of Iowa controls the wholesale distribution of liquor intended for retail sale (off-premises consumption), which means this dataset offers a complete view of retail liquor consumption in the entire state. The dataset contains every wholesale order of liquor by all grocery stores, liquor stores, convenience stores, etc., with details about the store and location, the exact liquor brand and size, and the number of bottles ordered.\nYou can find more details, as well as sample queries, in the GCP Marketplace here: https://console.cloud.google.com/marketplace/details/iowa-department-of-commerce/iowa-liquor-sales"
+  description = "\"This dataset contains every wholesale purchase of liquor in the State of Iowa by retailers for sale to individuals since January 1, 2012. The State of Iowa controls the wholesale distribution of liquor intended for retail sale (off-premises consumption), which means this dataset offers a complete view of retail liquor consumption in the entire state. The dataset contains every wholesale order of liquor by all grocery stores, liquor stores, convenience stores, etc., with details about the store and location, the exact liquor brand and size, and the number of bottles ordered.\nYou can find more details, as well as sample queries, in the GCP Marketplace here: https://console.cloud.google.com/marketplace/details/iowa-department-of-commerce/iowa-liquor-sales\""
 }
 
 output "bigquery_dataset-iowa_liquor_sales-dataset_id" {
diff --git a/datasets/iowa_liquor_sales/_terraform/sales_pipeline.tf b/datasets/iowa_liquor_sales/_terraform/sales_pipeline.tf
index e746052eb..f96909ba2 100644
--- a/datasets/iowa_liquor_sales/_terraform/sales_pipeline.tf
+++ b/datasets/iowa_liquor_sales/_terraform/sales_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "sales" {
+resource "google_bigquery_table" "iowa_liquor_sales_sales" {
   project    = var.project_id
   dataset_id = "iowa_liquor_sales"
   table_id   = "sales"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "sales" {
   ]
 }
 
-output "bigquery_table-sales-table_id" {
-  value = google_bigquery_table.sales.table_id
+output "bigquery_table-iowa_liquor_sales_sales-table_id" {
+  value = google_bigquery_table.iowa_liquor_sales_sales.table_id
 }
 
-output "bigquery_table-sales-id" {
-  value = google_bigquery_table.sales.id
+output "bigquery_table-iowa_liquor_sales_sales-id" {
+  value = google_bigquery_table.iowa_liquor_sales_sales.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_2014_pipeline.tf b/datasets/irs_990/_terraform/irs_990_2014_pipeline.tf
index 6f1027172..f9b05a0b5 100644
--- a/datasets/irs_990/_terraform/irs_990_2014_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_2014_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_2014" {
+resource "google_bigquery_table" "irs_990_irs_990_2014" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_2014"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_2014" {
   ]
 }
 
-output "bigquery_table-irs_990_2014-table_id" {
-  value = google_bigquery_table.irs_990_2014.table_id
+output "bigquery_table-irs_990_irs_990_2014-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_2014.table_id
 }
 
-output "bigquery_table-irs_990_2014-id" {
-  value = google_bigquery_table.irs_990_2014.id
+output "bigquery_table-irs_990_irs_990_2014-id" {
+  value = google_bigquery_table.irs_990_irs_990_2014.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_2015_pipeline.tf b/datasets/irs_990/_terraform/irs_990_2015_pipeline.tf
index bb52f2ec2..96fd0523c 100644
--- a/datasets/irs_990/_terraform/irs_990_2015_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_2015_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_2015" {
+resource "google_bigquery_table" "irs_990_irs_990_2015" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_2015"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_2015" {
   ]
 }
 
-output "bigquery_table-irs_990_2015-table_id" {
-  value = google_bigquery_table.irs_990_2015.table_id
+output "bigquery_table-irs_990_irs_990_2015-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_2015.table_id
 }
 
-output "bigquery_table-irs_990_2015-id" {
-  value = google_bigquery_table.irs_990_2015.id
+output "bigquery_table-irs_990_irs_990_2015-id" {
+  value = google_bigquery_table.irs_990_irs_990_2015.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_2016_pipeline.tf b/datasets/irs_990/_terraform/irs_990_2016_pipeline.tf
index 9a98af73f..8b4d53a56 100644
--- a/datasets/irs_990/_terraform/irs_990_2016_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_2016_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_2016" {
+resource "google_bigquery_table" "irs_990_irs_990_2016" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_2016"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_2016" {
   ]
 }
 
-output "bigquery_table-irs_990_2016-table_id" {
-  value = google_bigquery_table.irs_990_2016.table_id
+output "bigquery_table-irs_990_irs_990_2016-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_2016.table_id
 }
 
-output "bigquery_table-irs_990_2016-id" {
-  value = google_bigquery_table.irs_990_2016.id
+output "bigquery_table-irs_990_irs_990_2016-id" {
+  value = google_bigquery_table.irs_990_irs_990_2016.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_2017_pipeline.tf b/datasets/irs_990/_terraform/irs_990_2017_pipeline.tf
index 77dce805e..90ee3b60b 100644
--- a/datasets/irs_990/_terraform/irs_990_2017_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_2017_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_2017" {
+resource "google_bigquery_table" "irs_990_irs_990_2017" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_2017"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_2017" {
   ]
 }
 
-output "bigquery_table-irs_990_2017-table_id" {
-  value = google_bigquery_table.irs_990_2017.table_id
+output "bigquery_table-irs_990_irs_990_2017-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_2017.table_id
 }
 
-output "bigquery_table-irs_990_2017-id" {
-  value = google_bigquery_table.irs_990_2017.id
+output "bigquery_table-irs_990_irs_990_2017-id" {
+  value = google_bigquery_table.irs_990_irs_990_2017.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_ez_2014_pipeline.tf b/datasets/irs_990/_terraform/irs_990_ez_2014_pipeline.tf
index e41c19b45..35830d14e 100644
--- a/datasets/irs_990/_terraform/irs_990_ez_2014_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_ez_2014_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_ez_2014" {
+resource "google_bigquery_table" "irs_990_irs_990_ez_2014" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_ez_2014"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_ez_2014" {
   ]
 }
 
-output "bigquery_table-irs_990_ez_2014-table_id" {
-  value = google_bigquery_table.irs_990_ez_2014.table_id
+output "bigquery_table-irs_990_irs_990_ez_2014-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_ez_2014.table_id
 }
 
-output "bigquery_table-irs_990_ez_2014-id" {
-  value = google_bigquery_table.irs_990_ez_2014.id
+output "bigquery_table-irs_990_irs_990_ez_2014-id" {
+  value = google_bigquery_table.irs_990_irs_990_ez_2014.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_ez_2015_pipeline.tf b/datasets/irs_990/_terraform/irs_990_ez_2015_pipeline.tf
index 6ec430986..ff1ba84ee 100644
--- a/datasets/irs_990/_terraform/irs_990_ez_2015_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_ez_2015_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_ez_2015" {
+resource "google_bigquery_table" "irs_990_irs_990_ez_2015" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_ez_2015"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_ez_2015" {
   ]
 }
 
-output "bigquery_table-irs_990_ez_2015-table_id" {
-  value = google_bigquery_table.irs_990_ez_2015.table_id
+output "bigquery_table-irs_990_irs_990_ez_2015-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_ez_2015.table_id
 }
 
-output "bigquery_table-irs_990_ez_2015-id" {
-  value = google_bigquery_table.irs_990_ez_2015.id
+output "bigquery_table-irs_990_irs_990_ez_2015-id" {
+  value = google_bigquery_table.irs_990_irs_990_ez_2015.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_ez_2016_pipeline.tf b/datasets/irs_990/_terraform/irs_990_ez_2016_pipeline.tf
index 9ce37db35..8434c7e29 100644
--- a/datasets/irs_990/_terraform/irs_990_ez_2016_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_ez_2016_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_ez_2016" {
+resource "google_bigquery_table" "irs_990_irs_990_ez_2016" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_ez_2016"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_ez_2016" {
   ]
 }
 
-output "bigquery_table-irs_990_ez_2016-table_id" {
-  value = google_bigquery_table.irs_990_ez_2016.table_id
+output "bigquery_table-irs_990_irs_990_ez_2016-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_ez_2016.table_id
 }
 
-output "bigquery_table-irs_990_ez_2016-id" {
-  value = google_bigquery_table.irs_990_ez_2016.id
+output "bigquery_table-irs_990_irs_990_ez_2016-id" {
+  value = google_bigquery_table.irs_990_irs_990_ez_2016.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_ez_2017_pipeline.tf b/datasets/irs_990/_terraform/irs_990_ez_2017_pipeline.tf
index 81fbc1ae8..f90fcacc1 100644
--- a/datasets/irs_990/_terraform/irs_990_ez_2017_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_ez_2017_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_ez_2017" {
+resource "google_bigquery_table" "irs_990_irs_990_ez_2017" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_ez_2017"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_ez_2017" {
   ]
 }
 
-output "bigquery_table-irs_990_ez_2017-table_id" {
-  value = google_bigquery_table.irs_990_ez_2017.table_id
+output "bigquery_table-irs_990_irs_990_ez_2017-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_ez_2017.table_id
 }
 
-output "bigquery_table-irs_990_ez_2017-id" {
-  value = google_bigquery_table.irs_990_ez_2017.id
+output "bigquery_table-irs_990_irs_990_ez_2017-id" {
+  value = google_bigquery_table.irs_990_irs_990_ez_2017.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_pf_2014_pipeline.tf b/datasets/irs_990/_terraform/irs_990_pf_2014_pipeline.tf
index 34b7d2bb3..7b2f48790 100644
--- a/datasets/irs_990/_terraform/irs_990_pf_2014_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_pf_2014_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_pf_2014" {
+resource "google_bigquery_table" "irs_990_irs_990_pf_2014" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_pf_2014"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_pf_2014" {
   ]
 }
 
-output "bigquery_table-irs_990_pf_2014-table_id" {
-  value = google_bigquery_table.irs_990_pf_2014.table_id
+output "bigquery_table-irs_990_irs_990_pf_2014-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_pf_2014.table_id
 }
 
-output "bigquery_table-irs_990_pf_2014-id" {
-  value = google_bigquery_table.irs_990_pf_2014.id
+output "bigquery_table-irs_990_irs_990_pf_2014-id" {
+  value = google_bigquery_table.irs_990_irs_990_pf_2014.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_pf_2015_pipeline.tf b/datasets/irs_990/_terraform/irs_990_pf_2015_pipeline.tf
index f8ed21abd..86f3086e3 100644
--- a/datasets/irs_990/_terraform/irs_990_pf_2015_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_pf_2015_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_pf_2015" {
+resource "google_bigquery_table" "irs_990_irs_990_pf_2015" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_pf_2015"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_pf_2015" {
   ]
 }
 
-output "bigquery_table-irs_990_pf_2015-table_id" {
-  value = google_bigquery_table.irs_990_pf_2015.table_id
+output "bigquery_table-irs_990_irs_990_pf_2015-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_pf_2015.table_id
 }
 
-output "bigquery_table-irs_990_pf_2015-id" {
-  value = google_bigquery_table.irs_990_pf_2015.id
+output "bigquery_table-irs_990_irs_990_pf_2015-id" {
+  value = google_bigquery_table.irs_990_irs_990_pf_2015.id
 }
diff --git a/datasets/irs_990/_terraform/irs_990_pf_2016_pipeline.tf b/datasets/irs_990/_terraform/irs_990_pf_2016_pipeline.tf
index 99c885e12..8a5ce7e28 100644
--- a/datasets/irs_990/_terraform/irs_990_pf_2016_pipeline.tf
+++ b/datasets/irs_990/_terraform/irs_990_pf_2016_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "irs_990_pf_2016" {
+resource "google_bigquery_table" "irs_990_irs_990_pf_2016" {
   project    = var.project_id
   dataset_id = "irs_990"
   table_id   = "irs_990_pf_2016"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "irs_990_pf_2016" {
   ]
 }
 
-output "bigquery_table-irs_990_pf_2016-table_id" {
-  value = google_bigquery_table.irs_990_pf_2016.table_id
+output "bigquery_table-irs_990_irs_990_pf_2016-table_id" {
+  value = google_bigquery_table.irs_990_irs_990_pf_2016.table_id
 }
 
-output "bigquery_table-irs_990_pf_2016-id" {
-  value = google_bigquery_table.irs_990_pf_2016.id
+output "bigquery_table-irs_990_irs_990_pf_2016-id" {
+  value = google_bigquery_table.irs_990_irs_990_pf_2016.id
 }
diff --git a/datasets/new_york/311_service_requests/pipeline.yaml b/datasets/new_york/311_service_requests/pipeline.yaml
index 9c6a7714e..a7a0451fc 100644
--- a/datasets/new_york/311_service_requests/pipeline.yaml
+++ b/datasets/new_york/311_service_requests/pipeline.yaml
@@ -20,7 +20,7 @@ resources:
     description: "NYC 311 service requests logs"
 
 dag:
-  airflow-version: 2
+  airflow_version: 2
   initialize:
     dag_id: 311_service_requests
     default_args:
diff --git a/datasets/new_york/_terraform/311_service_requests_pipeline.tf b/datasets/new_york/_terraform/311_service_requests_pipeline.tf
index 5c042f779..f84f190e5 100644
--- a/datasets/new_york/_terraform/311_service_requests_pipeline.tf
+++ b/datasets/new_york/_terraform/311_service_requests_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "bqt_311_service_requests" {
+resource "google_bigquery_table" "bqt_new_york_311_service_requests" {
   project    = var.project_id
   dataset_id = "new_york"
   table_id   = "311_service_requests"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "bqt_311_service_requests" {
   ]
 }
 
-output "bigquery_table-311_service_requests-table_id" {
-  value = google_bigquery_table.bqt_311_service_requests.table_id
+output "bigquery_table-bqt_new_york_311_service_requests-table_id" {
+  value = google_bigquery_table.bqt_new_york_311_service_requests.table_id
 }
 
-output "bigquery_table-311_service_requests-id" {
-  value = google_bigquery_table.bqt_311_service_requests.id
+output "bigquery_table-bqt_new_york_311_service_requests-id" {
+  value = google_bigquery_table.bqt_new_york_311_service_requests.id
 }
diff --git a/datasets/new_york/_terraform/citibike_stations_pipeline.tf b/datasets/new_york/_terraform/citibike_stations_pipeline.tf
index 0ee31dc57..fafacbdd6 100644
--- a/datasets/new_york/_terraform/citibike_stations_pipeline.tf
+++ b/datasets/new_york/_terraform/citibike_stations_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "citibike_stations" {
+resource "google_bigquery_table" "new_york_citibike_stations" {
   project    = var.project_id
   dataset_id = "new_york"
   table_id   = "citibike_stations"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "citibike_stations" {
   ]
 }
 
-output "bigquery_table-citibike_stations-table_id" {
-  value = google_bigquery_table.citibike_stations.table_id
+output "bigquery_table-new_york_citibike_stations-table_id" {
+  value = google_bigquery_table.new_york_citibike_stations.table_id
 }
 
-output "bigquery_table-citibike_stations-id" {
-  value = google_bigquery_table.citibike_stations.id
+output "bigquery_table-new_york_citibike_stations-id" {
+  value = google_bigquery_table.new_york_citibike_stations.id
 }
diff --git a/datasets/new_york/_terraform/tree_census_1995_pipeline.tf b/datasets/new_york/_terraform/tree_census_1995_pipeline.tf
index b456bbb33..1385154d4 100644
--- a/datasets/new_york/_terraform/tree_census_1995_pipeline.tf
+++ b/datasets/new_york/_terraform/tree_census_1995_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "tree_census_1995" {
+resource "google_bigquery_table" "new_york_tree_census_1995" {
   project    = var.project_id
   dataset_id = "new_york"
   table_id   = "tree_census_1995"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "tree_census_1995" {
   ]
 }
 
-output "bigquery_table-tree_census_1995-table_id" {
-  value = google_bigquery_table.tree_census_1995.table_id
+output "bigquery_table-new_york_tree_census_1995-table_id" {
+  value = google_bigquery_table.new_york_tree_census_1995.table_id
 }
 
-output "bigquery_table-tree_census_1995-id" {
-  value = google_bigquery_table.tree_census_1995.id
+output "bigquery_table-new_york_tree_census_1995-id" {
+  value = google_bigquery_table.new_york_tree_census_1995.id
 }
diff --git a/datasets/new_york/citibike_stations/pipeline.yaml b/datasets/new_york/citibike_stations/pipeline.yaml
index d890cb4d4..ba5a4b40f 100644
--- a/datasets/new_york/citibike_stations/pipeline.yaml
+++ b/datasets/new_york/citibike_stations/pipeline.yaml
@@ -20,7 +20,7 @@ resources:
     description: ""
 
 dag:
-  airflow-version: 2
+  airflow_version: 2
   initialize:
     dag_id: citibike_stations
     default_args:
diff --git a/datasets/new_york/tree_census_1995/pipeline.yaml b/datasets/new_york/tree_census_1995/pipeline.yaml
index 02bcfb499..8118d60fb 100644
--- a/datasets/new_york/tree_census_1995/pipeline.yaml
+++ b/datasets/new_york/tree_census_1995/pipeline.yaml
@@ -20,7 +20,7 @@ resources:
     description: ""
 
 dag:
-  airflow-version: 2
+  airflow_version: 2
   initialize:
     dag_id: tree_census_1995
     default_args:
diff --git a/datasets/san_francisco_bikeshare_stations/_terraform/bikeshare_stations_pipeline.tf b/datasets/san_francisco_bikeshare_stations/_terraform/bikeshare_stations_pipeline.tf
index 7935b5868..55404d936 100644
--- a/datasets/san_francisco_bikeshare_stations/_terraform/bikeshare_stations_pipeline.tf
+++ b/datasets/san_francisco_bikeshare_stations/_terraform/bikeshare_stations_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "bikeshare_stations" {
+resource "google_bigquery_table" "san_francisco_bikeshare_stations_bikeshare_stations" {
   project    = var.project_id
   dataset_id = "san_francisco_bikeshare_stations"
   table_id   = "bikeshare_stations"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "bikeshare_stations" {
   ]
 }
 
-output "bigquery_table-bikeshare_stations-table_id" {
-  value = google_bigquery_table.bikeshare_stations.table_id
+output "bigquery_table-san_francisco_bikeshare_stations_bikeshare_stations-table_id" {
+  value = google_bigquery_table.san_francisco_bikeshare_stations_bikeshare_stations.table_id
 }
 
-output "bigquery_table-bikeshare_stations-id" {
-  value = google_bigquery_table.bikeshare_stations.id
+output "bigquery_table-san_francisco_bikeshare_stations_bikeshare_stations-id" {
+  value = google_bigquery_table.san_francisco_bikeshare_stations_bikeshare_stations.id
 }
diff --git a/datasets/san_francisco_bikeshare_status/_terraform/bikeshare_status_pipeline.tf b/datasets/san_francisco_bikeshare_status/_terraform/bikeshare_status_pipeline.tf
index 8df43325d..8bd054522 100644
--- a/datasets/san_francisco_bikeshare_status/_terraform/bikeshare_status_pipeline.tf
+++ b/datasets/san_francisco_bikeshare_status/_terraform/bikeshare_status_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "bikeshare_status" {
+resource "google_bigquery_table" "san_francisco_bikeshare_status_bikeshare_status" {
   project    = var.project_id
   dataset_id = "san_francisco_bikeshare_status"
   table_id   = "bikeshare_status"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "bikeshare_status" {
   ]
 }
 
-output "bigquery_table-bikeshare_status-table_id" {
-  value = google_bigquery_table.bikeshare_status.table_id
+output "bigquery_table-san_francisco_bikeshare_status_bikeshare_status-table_id" {
+  value = google_bigquery_table.san_francisco_bikeshare_status_bikeshare_status.table_id
 }
 
-output "bigquery_table-bikeshare_status-id" {
-  value = google_bigquery_table.bikeshare_status.id
+output "bigquery_table-san_francisco_bikeshare_status_bikeshare_status-id" {
+  value = google_bigquery_table.san_francisco_bikeshare_status_bikeshare_status.id
 }
diff --git a/datasets/san_francisco_film_locations/_terraform/film_locations_pipeline.tf b/datasets/san_francisco_film_locations/_terraform/film_locations_pipeline.tf
index 11566f97d..6bc956b65 100644
--- a/datasets/san_francisco_film_locations/_terraform/film_locations_pipeline.tf
+++ b/datasets/san_francisco_film_locations/_terraform/film_locations_pipeline.tf
@@ -15,12 +15,12 @@
  */
 
 
-resource "google_bigquery_table" "film_locations" {
+resource "google_bigquery_table" "san_francisco_film_locations_film_locations" {
   project    = var.project_id
   dataset_id = "san_francisco_film_locations"
   table_id   = "film_locations"
 
-  description = "san_francisco_film_locationsspc"
+  description = "If you love movies, and you love San Francisco, you\u0027re bound to love this -- a listing of filming locations of movies shot in San Francisco starting from 1924. You\u0027ll find the titles, locations, fun facts, names of the director, writer, actors, and studio for most of these films."
 
 
 
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "film_locations" {
   ]
 }
 
-output "bigquery_table-film_locations-table_id" {
-  value = google_bigquery_table.film_locations.table_id
+output "bigquery_table-san_francisco_film_locations_film_locations-table_id" {
+  value = google_bigquery_table.san_francisco_film_locations_film_locations.table_id
 }
 
-output "bigquery_table-film_locations-id" {
-  value = google_bigquery_table.film_locations.id
+output "bigquery_table-san_francisco_film_locations_film_locations-id" {
+  value = google_bigquery_table.san_francisco_film_locations_film_locations.id
 }
diff --git a/datasets/san_francisco_trees/_terraform/street_trees_pipeline.tf b/datasets/san_francisco_trees/_terraform/street_trees_pipeline.tf
index 56b16e64f..964126d6d 100644
--- a/datasets/san_francisco_trees/_terraform/street_trees_pipeline.tf
+++ b/datasets/san_francisco_trees/_terraform/street_trees_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "street_trees" {
+resource "google_bigquery_table" "san_francisco_trees_street_trees" {
   project    = var.project_id
   dataset_id = "san_francisco_trees"
   table_id   = "street_trees"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "street_trees" {
   ]
 }
 
-output "bigquery_table-street_trees-table_id" {
-  value = google_bigquery_table.street_trees.table_id
+output "bigquery_table-san_francisco_trees_street_trees-table_id" {
+  value = google_bigquery_table.san_francisco_trees_street_trees.table_id
 }
 
-output "bigquery_table-street_trees-id" {
-  value = google_bigquery_table.street_trees.id
+output "bigquery_table-san_francisco_trees_street_trees-id" {
+  value = google_bigquery_table.san_francisco_trees_street_trees.id
 }
diff --git a/datasets/usa_names/_terraform/usa_1910_current_pipeline.tf b/datasets/usa_names/_terraform/usa_1910_current_pipeline.tf
index b99d0cb29..2bb0aedf4 100644
--- a/datasets/usa_names/_terraform/usa_1910_current_pipeline.tf
+++ b/datasets/usa_names/_terraform/usa_1910_current_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "usa_1910_current" {
+resource "google_bigquery_table" "usa_names_usa_1910_current" {
   project    = var.project_id
   dataset_id = "usa_names"
   table_id   = "usa_1910_current"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "usa_1910_current" {
   ]
 }
 
-output "bigquery_table-usa_1910_current-table_id" {
-  value = google_bigquery_table.usa_1910_current.table_id
+output "bigquery_table-usa_names_usa_1910_current-table_id" {
+  value = google_bigquery_table.usa_names_usa_1910_current.table_id
 }
 
-output "bigquery_table-usa_1910_current-id" {
-  value = google_bigquery_table.usa_1910_current.id
+output "bigquery_table-usa_names_usa_1910_current-id" {
+  value = google_bigquery_table.usa_names_usa_1910_current.id
 }
diff --git a/datasets/world_bank_health_population/_terraform/country_series_definitions_pipeline.tf b/datasets/world_bank_health_population/_terraform/country_series_definitions_pipeline.tf
index 73b061087..3df7aa514 100644
--- a/datasets/world_bank_health_population/_terraform/country_series_definitions_pipeline.tf
+++ b/datasets/world_bank_health_population/_terraform/country_series_definitions_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "country_series_definitions" {
+resource "google_bigquery_table" "world_bank_health_population_country_series_definitions" {
   project    = var.project_id
   dataset_id = "world_bank_health_population"
   table_id   = "country_series_definitions"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "country_series_definitions" {
   ]
 }
 
-output "bigquery_table-country_series_definitions-table_id" {
-  value = google_bigquery_table.country_series_definitions.table_id
+output "bigquery_table-world_bank_health_population_country_series_definitions-table_id" {
+  value = google_bigquery_table.world_bank_health_population_country_series_definitions.table_id
 }
 
-output "bigquery_table-country_series_definitions-id" {
-  value = google_bigquery_table.country_series_definitions.id
+output "bigquery_table-world_bank_health_population_country_series_definitions-id" {
+  value = google_bigquery_table.world_bank_health_population_country_series_definitions.id
 }
diff --git a/datasets/world_bank_health_population/_terraform/country_summary_pipeline.tf b/datasets/world_bank_health_population/_terraform/country_summary_pipeline.tf
index 9edd1cfad..040cbb5e0 100644
--- a/datasets/world_bank_health_population/_terraform/country_summary_pipeline.tf
+++ b/datasets/world_bank_health_population/_terraform/country_summary_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "country_summary" {
+resource "google_bigquery_table" "world_bank_health_population_country_summary" {
   project    = var.project_id
   dataset_id = "world_bank_health_population"
   table_id   = "country_summary"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "country_summary" {
   ]
 }
 
-output "bigquery_table-country_summary-table_id" {
-  value = google_bigquery_table.country_summary.table_id
+output "bigquery_table-world_bank_health_population_country_summary-table_id" {
+  value = google_bigquery_table.world_bank_health_population_country_summary.table_id
 }
 
-output "bigquery_table-country_summary-id" {
-  value = google_bigquery_table.country_summary.id
+output "bigquery_table-world_bank_health_population_country_summary-id" {
+  value = google_bigquery_table.world_bank_health_population_country_summary.id
 }
diff --git a/datasets/world_bank_health_population/_terraform/series_summary_pipeline.tf b/datasets/world_bank_health_population/_terraform/series_summary_pipeline.tf
index 98f24abe9..2272503fd 100644
--- a/datasets/world_bank_health_population/_terraform/series_summary_pipeline.tf
+++ b/datasets/world_bank_health_population/_terraform/series_summary_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "series_summary" {
+resource "google_bigquery_table" "world_bank_health_population_series_summary" {
   project    = var.project_id
   dataset_id = "world_bank_health_population"
   table_id   = "series_summary"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "series_summary" {
   ]
 }
 
-output "bigquery_table-series_summary-table_id" {
-  value = google_bigquery_table.series_summary.table_id
+output "bigquery_table-world_bank_health_population_series_summary-table_id" {
+  value = google_bigquery_table.world_bank_health_population_series_summary.table_id
 }
 
-output "bigquery_table-series_summary-id" {
-  value = google_bigquery_table.series_summary.id
+output "bigquery_table-world_bank_health_population_series_summary-id" {
+  value = google_bigquery_table.world_bank_health_population_series_summary.id
 }
diff --git a/datasets/world_bank_health_population/_terraform/series_times_pipeline.tf b/datasets/world_bank_health_population/_terraform/series_times_pipeline.tf
index 0aafd26ad..c4ad621ca 100644
--- a/datasets/world_bank_health_population/_terraform/series_times_pipeline.tf
+++ b/datasets/world_bank_health_population/_terraform/series_times_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "series_times" {
+resource "google_bigquery_table" "world_bank_health_population_series_times" {
   project    = var.project_id
   dataset_id = "world_bank_health_population"
   table_id   = "series_times"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "series_times" {
   ]
 }
 
-output "bigquery_table-series_times-table_id" {
-  value = google_bigquery_table.series_times.table_id
+output "bigquery_table-world_bank_health_population_series_times-table_id" {
+  value = google_bigquery_table.world_bank_health_population_series_times.table_id
 }
 
-output "bigquery_table-series_times-id" {
-  value = google_bigquery_table.series_times.id
+output "bigquery_table-world_bank_health_population_series_times-id" {
+  value = google_bigquery_table.world_bank_health_population_series_times.id
 }
diff --git a/datasets/world_bank_health_population/country_series_definitions/country_series_definitions_dag.py b/datasets/world_bank_health_population/country_series_definitions/country_series_definitions_dag.py
index 12cdd6ea2..3a3239d25 100644
--- a/datasets/world_bank_health_population/country_series_definitions/country_series_definitions_dag.py
+++ b/datasets/world_bank_health_population/country_series_definitions/country_series_definitions_dag.py
@@ -62,7 +62,7 @@
             "SOURCE_FILE": "files/data.csv",
             "COLUMN_TO_REMOVE": "Unnamed: 3",
             "TARGET_FILE": "files/data_output.csv",
-            "TARGET_GCS_BUCKET": "{{ var.json.shared.composer_bucket }}",
+            "TARGET_GCS_BUCKET": "{{ var.value.composer_bucket }}",
             "TARGET_GCS_PATH": "data/world_bank_health_population/country_series_definitions/data_output.csv",
             "PIPELINE_NAME": "country_series_definitions",
             "CSV_HEADERS": '["country_code" ,"series_code" ,"description"]',
@@ -74,7 +74,7 @@
     # Task to load CSV data to a BigQuery table
     load_country_series_definitions_to_bq = gcs_to_bq.GoogleCloudStorageToBigQueryOperator(
         task_id="load_country_series_definitions_to_bq",
-        bucket="{{ var.json.shared.composer_bucket }}",
+        bucket="{{ var.value.composer_bucket }}",
         source_objects=[
             "data/world_bank_health_population/country_series_definitions/data_output.csv"
         ],
diff --git a/datasets/world_bank_health_population/country_summary/country_summary_dag.py b/datasets/world_bank_health_population/country_summary/country_summary_dag.py
index 0eea30043..1fad79c56 100644
--- a/datasets/world_bank_health_population/country_summary/country_summary_dag.py
+++ b/datasets/world_bank_health_population/country_summary/country_summary_dag.py
@@ -62,7 +62,7 @@
             "SOURCE_FILE": "files/data.csv",
             "COLUMN_TO_REMOVE": "Unnamed: 30",
             "TARGET_FILE": "files/data_output.csv",
-            "TARGET_GCS_BUCKET": "{{ var.json.shared.composer_bucket }}",
+            "TARGET_GCS_BUCKET": "{{ var.value.composer_bucket }}",
             "TARGET_GCS_PATH": "data/world_bank_health_population/country_summary/data_output.csv",
             "PIPELINE_NAME": "country_summary",
             "CSV_HEADERS": '["country_code","short_name","table_name","long_name","two_alpha_code","currency_unit","special_notes","region","income_group","wb_2_code","national_accounts_base_year","national_accounts_reference_year","sna_price_valuation","lending_category","other_groups","system_of_national_accounts","alternative_conversion_factor","ppp_survey_year","balance_of_payments_manual_in_use","external_debt_reporting_status","system_of_trade","government_accounting_concept","imf_data_dissemination_standard","latest_population_census","latest_household_survey","source_of_most_recent_income_and_expenditure_data","vital_registration_complete","latest_agricultural_census","latest_industrial_data","latest_trade_data","latest_water_withdrawal_data"]',
@@ -74,7 +74,7 @@
     # Task to load CSV data to a BigQuery table
     load_country_summary_to_bq = gcs_to_bq.GoogleCloudStorageToBigQueryOperator(
         task_id="load_country_summary_to_bq",
-        bucket="{{ var.json.shared.composer_bucket }}",
+        bucket="{{ var.value.composer_bucket }}",
         source_objects=[
             "data/world_bank_health_population/country_summary/data_output.csv"
         ],
diff --git a/datasets/world_bank_health_population/series_summary/series_summary_dag.py b/datasets/world_bank_health_population/series_summary/series_summary_dag.py
index e2284a972..d6f065e31 100644
--- a/datasets/world_bank_health_population/series_summary/series_summary_dag.py
+++ b/datasets/world_bank_health_population/series_summary/series_summary_dag.py
@@ -62,7 +62,7 @@
             "SOURCE_FILE": "files/data.csv",
             "COLUMN_TO_REMOVE": "Unnamed: 20",
             "TARGET_FILE": "files/data_output.csv",
-            "TARGET_GCS_BUCKET": "{{ var.json.shared.composer_bucket }}",
+            "TARGET_GCS_BUCKET": "{{ var.value.composer_bucket }}",
             "TARGET_GCS_PATH": "data/world_bank_health_population/series_summary/data_output.csv",
             "PIPELINE_NAME": "series_summary",
             "CSV_HEADERS": '["series_code" ,"topic" ,"indicator_name" ,"short_definition" ,"long_definition" ,"unit_of_measure" ,"periodicity" ,"base_period" ,"other_notes" ,"aggregation_method" ,"limitations_and_exceptions" ,"notes_from_original_source" ,"general_comments" ,"source" ,"statistical_concept_and_methodology" ,"development_relevance" ,"related_source_links" ,"other_web_links" ,"related_indicators" ,"license_type"]',
@@ -74,7 +74,7 @@
     # Task to load CSV data to a BigQuery table
     load_series_summary_to_bq = gcs_to_bq.GoogleCloudStorageToBigQueryOperator(
         task_id="load_series_summary_to_bq",
-        bucket="{{ var.json.shared.composer_bucket }}",
+        bucket="{{ var.value.composer_bucket }}",
         source_objects=[
             "data/world_bank_health_population/series_summary/data_output.csv"
         ],
diff --git a/datasets/world_bank_health_population/series_times/series_times_dag.py b/datasets/world_bank_health_population/series_times/series_times_dag.py
index b5ead5dc1..1b891fc6b 100644
--- a/datasets/world_bank_health_population/series_times/series_times_dag.py
+++ b/datasets/world_bank_health_population/series_times/series_times_dag.py
@@ -62,7 +62,7 @@
             "SOURCE_FILE": "files/data.csv",
             "COLUMN_TO_REMOVE": "Unnamed: 3",
             "TARGET_FILE": "files/data_output.csv",
-            "TARGET_GCS_BUCKET": "{{ var.json.shared.composer_bucket }}",
+            "TARGET_GCS_BUCKET": "{{ var.value.composer_bucket }}",
             "TARGET_GCS_PATH": "data/world_bank_health_population/series_times/data_output.csv",
             "PIPELINE_NAME": "series_times",
             "CSV_HEADERS": '["series_code","year","description"]',
@@ -74,7 +74,7 @@
     # Task to load CSV data to a BigQuery table
     load_series_times_to_bq = gcs_to_bq.GoogleCloudStorageToBigQueryOperator(
         task_id="load_series_times_to_bq",
-        bucket="{{ var.json.shared.composer_bucket }}",
+        bucket="{{ var.value.composer_bucket }}",
         source_objects=[
             "data/world_bank_health_population/series_times/data_output.csv"
         ],
diff --git a/datasets/world_bank_intl_debt/_terraform/country_series_definitions_pipeline.tf b/datasets/world_bank_intl_debt/_terraform/country_series_definitions_pipeline.tf
index 5fd062ed4..2283e5de2 100644
--- a/datasets/world_bank_intl_debt/_terraform/country_series_definitions_pipeline.tf
+++ b/datasets/world_bank_intl_debt/_terraform/country_series_definitions_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "country_series_definitions" {
+resource "google_bigquery_table" "world_bank_intl_debt_country_series_definitions" {
   project    = var.project_id
   dataset_id = "world_bank_intl_debt"
   table_id   = "country_series_definitions"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "country_series_definitions" {
   ]
 }
 
-output "bigquery_table-country_series_definitions-table_id" {
-  value = google_bigquery_table.country_series_definitions.table_id
+output "bigquery_table-world_bank_intl_debt_country_series_definitions-table_id" {
+  value = google_bigquery_table.world_bank_intl_debt_country_series_definitions.table_id
 }
 
-output "bigquery_table-country_series_definitions-id" {
-  value = google_bigquery_table.country_series_definitions.id
+output "bigquery_table-world_bank_intl_debt_country_series_definitions-id" {
+  value = google_bigquery_table.world_bank_intl_debt_country_series_definitions.id
 }
diff --git a/datasets/world_bank_intl_debt/_terraform/country_summary_pipeline.tf b/datasets/world_bank_intl_debt/_terraform/country_summary_pipeline.tf
index 919f75e33..c9a83d2b0 100644
--- a/datasets/world_bank_intl_debt/_terraform/country_summary_pipeline.tf
+++ b/datasets/world_bank_intl_debt/_terraform/country_summary_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "country_summary" {
+resource "google_bigquery_table" "world_bank_intl_debt_country_summary" {
   project    = var.project_id
   dataset_id = "world_bank_intl_debt"
   table_id   = "country_summary"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "country_summary" {
   ]
 }
 
-output "bigquery_table-country_summary-table_id" {
-  value = google_bigquery_table.country_summary.table_id
+output "bigquery_table-world_bank_intl_debt_country_summary-table_id" {
+  value = google_bigquery_table.world_bank_intl_debt_country_summary.table_id
 }
 
-output "bigquery_table-country_summary-id" {
-  value = google_bigquery_table.country_summary.id
+output "bigquery_table-world_bank_intl_debt_country_summary-id" {
+  value = google_bigquery_table.world_bank_intl_debt_country_summary.id
 }
diff --git a/datasets/world_bank_intl_debt/_terraform/series_summary_pipeline.tf b/datasets/world_bank_intl_debt/_terraform/series_summary_pipeline.tf
index ed5a439cb..ad6b43cf6 100644
--- a/datasets/world_bank_intl_debt/_terraform/series_summary_pipeline.tf
+++ b/datasets/world_bank_intl_debt/_terraform/series_summary_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "series_summary" {
+resource "google_bigquery_table" "world_bank_intl_debt_series_summary" {
   project    = var.project_id
   dataset_id = "world_bank_intl_debt"
   table_id   = "series_summary"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "series_summary" {
   ]
 }
 
-output "bigquery_table-series_summary-table_id" {
-  value = google_bigquery_table.series_summary.table_id
+output "bigquery_table-world_bank_intl_debt_series_summary-table_id" {
+  value = google_bigquery_table.world_bank_intl_debt_series_summary.table_id
 }
 
-output "bigquery_table-series_summary-id" {
-  value = google_bigquery_table.series_summary.id
+output "bigquery_table-world_bank_intl_debt_series_summary-id" {
+  value = google_bigquery_table.world_bank_intl_debt_series_summary.id
 }
diff --git a/datasets/world_bank_intl_debt/_terraform/series_times_pipeline.tf b/datasets/world_bank_intl_debt/_terraform/series_times_pipeline.tf
index 14db30c48..c03bc3b57 100644
--- a/datasets/world_bank_intl_debt/_terraform/series_times_pipeline.tf
+++ b/datasets/world_bank_intl_debt/_terraform/series_times_pipeline.tf
@@ -15,7 +15,7 @@
  */
 
 
-resource "google_bigquery_table" "series_times" {
+resource "google_bigquery_table" "world_bank_intl_debt_series_times" {
   project    = var.project_id
   dataset_id = "world_bank_intl_debt"
   table_id   = "series_times"
@@ -30,10 +30,10 @@ resource "google_bigquery_table" "series_times" {
   ]
 }
 
-output "bigquery_table-series_times-table_id" {
-  value = google_bigquery_table.series_times.table_id
+output "bigquery_table-world_bank_intl_debt_series_times-table_id" {
+  value = google_bigquery_table.world_bank_intl_debt_series_times.table_id
 }
 
-output "bigquery_table-series_times-id" {
-  value = google_bigquery_table.series_times.id
+output "bigquery_table-world_bank_intl_debt_series_times-id" {
+  value = google_bigquery_table.world_bank_intl_debt_series_times.id
 }