diff --git a/src/metabase/sync/analyze/classifiers/name.clj b/src/metabase/sync/analyze/classifiers/name.clj
index f64dec67f68155fdb1196004e799fcc0d2c48ae1..bd185fc776c43f75963682d6a88da22013d8ffaf 100644
--- a/src/metabase/sync/analyze/classifiers/name.clj
+++ b/src/metabase/sync/analyze/classifiers/name.clj
@@ -41,6 +41,7 @@
    [#"^active$"                    bool-or-int-type :type/Category]
    [#"^city$"                      text-type        :type/City]
    [#"^country"                    text-type        :type/Country]
+   [#"_country$"                   text-type        :type/Country]
    [#"^currency$"                  int-or-text-type :type/Category]
    [#"^first(?:_?)name$"           text-type        :type/Name]
    [#"^full(?:_?)name$"            text-type        :type/Name]
@@ -57,6 +58,7 @@
    [#"^role$"                      int-or-text-type :type/Category]
    [#"^sex$"                       int-or-text-type :type/Category]
    [#"^state$"                     text-type        :type/State]
+   [#"_state$"                     text-type        :type/State]
    [#"^status$"                    int-or-text-type :type/Category]
    [#"^type$"                      int-or-text-type :type/Category]
    [#"^url$"                       text-type        :type/URL]