diff --git a/data/presets/office/_notary.json b/data/presets/office/_notary.json
new file mode 100644
index 00000000..92294add
--- /dev/null
+++ b/data/presets/office/_notary.json
@@ -0,0 +1,12 @@
+{
+    "icon": "fas-stamp",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "notary"
+    },
+    "searchable": false,
+    "name": "Notary Public (Common Law)"
+}
diff --git a/data/presets/office/lawyer/_notary.json b/data/presets/office/lawyer/_notary.json
deleted file mode 100644
index e9dd0be1..00000000
--- a/data/presets/office/lawyer/_notary.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "icon": "maki-suitcase",
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "tags": {
-        "office": "lawyer",
-        "lawyer": "notary"
-    },
-    "reference": {
-        "key": "office",
-        "value": "notary"
-    },
-    "searchable": false,
-    "name": "Notary Office"
-}
diff --git a/data/presets/office/lawyer/notary-common-law.json b/data/presets/office/lawyer/notary-common-law.json
new file mode 100644
index 00000000..5abaf574
--- /dev/null
+++ b/data/presets/office/lawyer/notary-common-law.json
@@ -0,0 +1,34 @@
+{
+    "icon": "fas-stamp",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "lawyer",
+        "lawyer": "notary"
+    },
+    "reference": {
+        "key": "office",
+        "value": "notary"
+    },
+    "locationSet": {
+        "include": [
+            "US",
+            "UK",
+            "CA",
+            "AU",
+            "IE",
+            "NZ"
+        ]
+    },
+    "terms": [
+        "clerk",
+        "deeds",
+        "estate",
+        "notary office",
+        "signature",
+        "wills"
+    ],
+    "name": "Civil Law Notary"
+}
diff --git a/data/presets/office/lawyer/notary.json b/data/presets/office/lawyer/notary.json
new file mode 100644
index 00000000..ce8c9b7f
--- /dev/null
+++ b/data/presets/office/lawyer/notary.json
@@ -0,0 +1,34 @@
+{
+    "icon": "fas-stamp",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "office": "lawyer",
+        "lawyer": "notary"
+    },
+    "reference": {
+        "key": "office",
+        "value": "notary"
+    },
+    "locationSet": {
+        "exclude": [
+            "US",
+            "UK",
+            "CA",
+            "AU",
+            "IE",
+            "NZ"
+        ]
+    },
+    "terms": [
+        "clerk",
+        "deeds",
+        "estate",
+        "notary office",
+        "signature",
+        "wills"
+    ],
+    "name": "Notary Office"
+}
diff --git a/data/presets/office/notary.json b/data/presets/office/notary-common-law.json
similarity index 52%
rename from data/presets/office/notary.json
rename to data/presets/office/notary-common-law.json
index 225331b9..0d84513a 100644
--- a/data/presets/office/notary.json
+++ b/data/presets/office/notary-common-law.json
@@ -7,12 +7,23 @@
     "tags": {
         "office": "notary"
     },
+    "locationSet": {
+        "include": [
+            "US",
+            "UK",
+            "CA",
+            "AU",
+            "IE",
+            "NZ"
+        ]
+    },
     "terms": [
         "clerk",
         "deeds",
         "estate",
+        "notary office",
         "signature",
         "wills"
     ],
-    "name": "Notary Office"
+    "name": "Notary Public"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 065d920f..bbd90ac9 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -7756,6 +7756,13 @@ en:
       office/lawyer/notary:
         # 'office=lawyer + lawyer=notary\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Notary Office
+        # 'terms: clerk,deeds,estate,notary office,signature,wills'
+        terms: '<translate with synonyms or related terms for ''Notary Office'', separated by commas>'
+      office/lawyer/notary-common-law:
+        # 'office=lawyer + lawyer=notary\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Civil Law Notary
+        # 'terms: clerk,deeds,estate,notary office,signature,wills'
+        terms: '<translate with synonyms or related terms for ''Civil Law Notary'', separated by commas>'
       office/moving_company:
         # 'office=moving_company\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Moving Company Office
@@ -7773,9 +7780,12 @@ en:
         terms: '<translate with synonyms or related terms for ''NGO Office'', separated by commas>'
       office/notary:
         # 'office=notary\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Notary Office
-        # 'terms: clerk,deeds,estate,signature,wills'
-        terms: '<translate with synonyms or related terms for ''Notary Office'', separated by commas>'
+        name: Notary Public (Common Law)
+      office/notary-common-law:
+        # 'office=notary\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Notary Public
+        # 'terms: clerk,deeds,estate,notary office,signature,wills'
+        terms: '<translate with synonyms or related terms for ''Notary Public'', separated by commas>'
       office/physician:
         # 'office=physician\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Physician