diff --git a/frontend/test/metabase-bootstrap.js b/frontend/test/metabase-bootstrap.js
index aa4d9e7ae248e4ed9bf61ddbee1e0fed4b011423..cfc52dfb7d14fee8039e20cd8954883630c5130a 100644
--- a/frontend/test/metabase-bootstrap.js
+++ b/frontend/test/metabase-bootstrap.js
@@ -37,7 +37,7 @@ window.MetabaseBootstrap = {
         "type/Integer":                   ["type/Number"],
         "type/Latitude":                  ["type/Coordinate"],
         "type/Longitude":                 ["type/Coordinate"],
-        "type/Name":                      ["type/Category", "type/Address", "type/Text"],
+        "type/Name":                      ["type/Category", "type/Text"],
         "type/Number":                    ["type/*"],
         "type/PK":                        ["type/Special"],
         "type/SerializedJSON":            ["type/Text", "type/Collection"],
diff --git a/src/metabase/types.clj b/src/metabase/types.clj
index 7113e9b88b789572aa8c034b4831d9d0dead33c3..28a413c6530bc513544198462d8ddafd80dc534b 100644
--- a/src/metabase/types.clj
+++ b/src/metabase/types.clj
@@ -71,7 +71,6 @@
 (derive :type/City :type/Address)
 (derive :type/State :type/Address)
 (derive :type/Country :type/Address)
-(derive :type/Name :type/Address)
 (derive :type/ZipCode :type/Address)