diff --git a/db/sample-changesets/actransit.json b/db/sample-changesets/actransit.json
index 7e1e30d3a..f97d3d742 100644
--- a/db/sample-changesets/actransit.json
+++ b/db/sample-changesets/actransit.json
@@ -14,8 +14,8 @@
             "name": "Alameda-Contra Costa Transit District",
             "shortName": "AC Transit",
             "identifiedBy": ["usntd://9014"],
-            "country": "United States",
-            "state": "California",
+            "country": "US",
+            "state": "US-CA",
             "metro": "San Francisco Bay Area",
             "timezone": "America/Los_Angeles",
             "website": "http://www.actransit.org/",
diff --git a/db/sample-changesets/bart.json b/db/sample-changesets/bart.json
index 6fe5076b1..d5504250b 100644
--- a/db/sample-changesets/bart.json
+++ b/db/sample-changesets/bart.json
@@ -16,8 +16,8 @@
             "identifiedBy": [
               "usntd://9003"
             ],
-            "country": "United States",
-            "state": "California",
+            "country": "US",
+            "state": "US-CA",
             "metro": "San Francisco Bay Area",
             "timezone": "America/Los_Angeles",
             "website": "http://www.bart.gov/",
diff --git a/db/sample-changesets/caltrain.json b/db/sample-changesets/caltrain.json
index fd6fc2f03..58ca45ccf 100644
--- a/db/sample-changesets/caltrain.json
+++ b/db/sample-changesets/caltrain.json
@@ -13,8 +13,8 @@
             "onestopId": "o-9q9-caltrain",
             "name": "Caltrain",
             "identifiedBy": ["usntd://9134"],
-            "country": "United States",
-            "state": "California",
+            "country": "US",
+            "state": "US-CA",
             "metro": "San Francisco Bay Area",
             "timezone": "America/Los_Angeles",
             "website": "http://www.caltrain.com/",
diff --git a/db/sample-changesets/nycdotsiferry.json b/db/sample-changesets/nycdotsiferry.json
index 358916e82..2aa47a266 100644
--- a/db/sample-changesets/nycdotsiferry.json
+++ b/db/sample-changesets/nycdotsiferry.json
@@ -14,8 +14,8 @@
             "name": "New York City Department of Transportation",
             "shortName": "NYC DOT",
             "identifiedBy": ["usntd://2082"],
-            "country": "United States",
-            "state": "New York",
+            "country": "US",
+            "state": "US-NY",
             "metro": "New York City",
             "timezone": "America/New_York",
             "website": "http://nyc.gov/dot",
diff --git a/db/sample-changesets/nyct.json b/db/sample-changesets/nyct.json
index 8e9557ef9..910d184c3 100644
--- a/db/sample-changesets/nyct.json
+++ b/db/sample-changesets/nyct.json
@@ -14,8 +14,8 @@
             "name": "MTA New York City Transit",
             "shortName": "NYCT",
             "identifiedBy": ["usntd://2008"],
-            "country": "United States",
-            "state": "New York",
+            "country": "US",
+            "state": "US-NY",
             "metro": "New York City",
             "timezone": "America/New_York",
             "website": "http://web.mta.info/",
diff --git a/db/sample-changesets/path.json b/db/sample-changesets/path.json
index bb5e6a54a..baac852b6 100644
--- a/db/sample-changesets/path.json
+++ b/db/sample-changesets/path.json
@@ -14,8 +14,8 @@
             "name": "Port Authority Trans-Hudson",
             "shortName": "PATH",
             "identifiedBy": ["usntd://2075"],
-            "country": "United States",
-            "state": "New York",
+            "country": "US",
+            "state": "US-NY",
             "metro": "New York City",
             "timezone": "America/New_York",
             "website": "http://www.panynj.gov/",
diff --git a/db/sample-changesets/samtrans.json b/db/sample-changesets/samtrans.json
index 33ba19b04..879eb6139 100644
--- a/db/sample-changesets/samtrans.json
+++ b/db/sample-changesets/samtrans.json
@@ -14,8 +14,8 @@
             "name": "San Mateo County Transit District",
             "shortName": "Samtrans",
             "identifiedBy": ["usntd://9009"],
-            "country": "United States",
-            "state": "California",
+            "country": "US",
+            "state": "US-CA",
             "metro": "San Francisco Bay Area",
             "timezone": "America/Los_Angeles",
             "website": "http://www.samtrans.com/",
diff --git a/db/sample-changesets/sfmta.json b/db/sample-changesets/sfmta.json
index 4cb9c41b3..9382c3134 100644
--- a/db/sample-changesets/sfmta.json
+++ b/db/sample-changesets/sfmta.json
@@ -14,8 +14,8 @@
             "name": "San Francisco Municipal Transportation Agency",
             "shortName": "SFMTA",
             "identifiedBy": ["usntd://9015"],
-            "country": "United States",
-            "state": "California",
+            "country": "US",
+            "state": "US-CA",
             "metro": "San Francisco Bay Area",
             "timezone": "America/Los_Angeles",
             "website": "http://www.sfmta.com/",
diff --git a/db/sample-changesets/vta.json b/db/sample-changesets/vta.json
index 313d41012..99abba69a 100644
--- a/db/sample-changesets/vta.json
+++ b/db/sample-changesets/vta.json
@@ -14,8 +14,8 @@
             "name": "Santa Clara Valley Transportation Authority",
             "shortName": "VTA",
             "identifiedBy": ["usntd://9013"],
-            "country": "United States",
-            "state": "California",
+            "country": "US",
+            "state": "US-CA",
             "metro": "San Francisco Bay Area",
             "timezone": "America/Los_Angeles",
             "website": "http://www.vta.org/",
diff --git a/spec/controllers/api/v1/operators_controller_spec.rb b/spec/controllers/api/v1/operators_controller_spec.rb
index 260f92378..757c4c980 100644
--- a/spec/controllers/api/v1/operators_controller_spec.rb
+++ b/spec/controllers/api/v1/operators_controller_spec.rb
@@ -145,19 +145,19 @@
   describe 'GET aggregate' do
     before(:each) do
       Rails.cache.clear
-      create(:operator, country: 'United States', state: 'California', metro: 'San Francisco Bay Area', timezone: 'America/Los_Angeles')
-      create(:operator, country: 'United States', state: 'California', metro: 'San Francisco Bay Area', timezone: 'America/Los_Angeles')
-      create(:operator, country: 'United States', state: 'California', metro: 'Los Angeles', timezone: 'America/Los_Angeles')
+      create(:operator, country: 'US', state: 'US-CA', metro: 'San Francisco Bay Area', timezone: 'America/Los_Angeles')
+      create(:operator, country: 'US', state: 'US-CA', metro: 'San Francisco Bay Area', timezone: 'America/Los_Angeles')
+      create(:operator, country: 'US', state: 'US-CA', metro: 'Los Angeles', timezone: 'America/Los_Angeles')
     end
 
     it 'returns a list of all countries with counts for each' do
       get :aggregate
-      expect_json('country.United States.count', 3)
+      expect_json('country.US.count', 3)
     end
 
     it 'returns a list of all states with counts for each' do
       get :aggregate
-      expect_json('state.California.count', 3)
+      expect_json('state.US-CA.count', 3)
     end
 
     it 'returns a list of all metros with counts for each' do