diff --git a/forms/migrate_billing.rb b/forms/migrate_billing.rb
index eeb1952ddf6ede672dd5451e90946a807c4b535b..2cacf52c5c43de26484a85a367188ba70b50c5a5 100644
--- a/forms/migrate_billing.rb
+++ b/forms/migrate_billing.rb
@@ -35,11 +35,11 @@ field(
 	required: true,
 	options: [
 		{
-			value: "cad_beta_unlimited-v20210223",
+			value: "CAD",
 			label: "Canadian Dollars"
 		},
 		{
-			value: "usd_beta_unlimited-v20210223",
+			value: "USD",
 			label: "United States Dollars"
 		}
 	]
diff --git a/forms/registration/plan_name.rb b/forms/registration/plan_name.rb
index a5c72affdfdf4d18e297b8ee1ccb1fb1c76c9a70..5af368d2609e0db3102d0f21b2b3036df21f98af 100644
--- a/forms/registration/plan_name.rb
+++ b/forms/registration/plan_name.rb
@@ -5,11 +5,11 @@ field(
 	required: true,
 	options: [
 		{
-			value: "cad_beta_unlimited-v20210223",
+			value: "CAD",
 			label: "Canadian Dollars"
 		},
 		{
-			value: "usd_beta_unlimited-v20210223",
+			value: "USD",
 			label: "United States Dollars"
 		}
 	]
diff --git a/lib/trust_level.rb b/lib/trust_level.rb
index df2a6943bb3a23fbcf7839c9470e50a4979c7c76..7e8f29781e8f909adfeda2364bcf3047ce77c2a6 100644
--- a/lib/trust_level.rb
+++ b/lib/trust_level.rb
@@ -126,7 +126,9 @@ module TrustLevel
 
 		EXPENSIVE_ROUTE = {
 			"usd_beta_unlimited-v20210223" => 0.9,
-			"cad_beta_unlimited-v20210223" => 1.1
+			"USD" => 0.9,
+			"cad_beta_unlimited-v20210223" => 1.1,
+			"CAD" => 1.1
 		}.freeze
 
 		def initialize(plan_name)