diff --git a/data/fields/highway_cartpath.json b/data/fields/highway_cartpath.json
new file mode 100644
index 00000000..e86e413b
--- /dev/null
+++ b/data/fields/highway_cartpath.json
@@ -0,0 +1,12 @@
+{
+    "key": "highway",
+    "type": "typeCombo",
+    "label": "Type of Path",
+    "strings": {
+        "options": {
+            "path": "Cartpath",
+            "service": "Service Road"
+        }
+    },
+    "autoSuggestions": false
+}
diff --git a/data/presets/golf/cartpath.json b/data/presets/golf/cartpath.json
index acf329fb..7d8fe07e 100644
--- a/data/presets/golf/cartpath.json
+++ b/data/presets/golf/cartpath.json
@@ -1,6 +1,8 @@
 {
     "icon": "temaki-golf_cart",
     "fields": [
+        "name",
+        "highway_cartpath",
         "{golf/path}",
         "maxspeed"
     ],
@@ -12,8 +14,11 @@
     },
     "addTags": {
         "golf": "cartpath",
-        "golf_cart": "designated",
-        "highway": "service"
+        "highway": "path",
+        "golf_cart": "yes"
     },
+    "terms": [
+        "cartpath"
+    ],
     "name": "Golf Cartpath"
 }
diff --git a/data/presets/golf/path.json b/data/presets/golf/path.json
index 3627d3de..a7361d2e 100644
--- a/data/presets/golf/path.json
+++ b/data/presets/golf/path.json
@@ -5,6 +5,7 @@
         "surface",
         "width",
         "structure",
+        "access",
         "incline"
     ],
     "geometry": [
@@ -15,8 +16,10 @@
     },
     "addTags": {
         "golf": "path",
-        "highway": "path",
-        "foot": "designated"
+        "highway": "footway"
     },
+    "terms": [
+        "golf path"
+    ],
     "name": "Golf Walking Path"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 20e1dadf..0026a916 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -1388,6 +1388,14 @@ en:
       highway:
         # highway=*
         label: Type
+      highway_cartpath:
+        # highway=*
+        label: Type of Path
+        options:
+          # highway=path
+          path: Cartpath
+          # highway=service
+          service: Service Road
       historic:
         # historic=*
         label: Type
@@ -5808,6 +5816,7 @@ en:
       golf/cartpath:
         # golf=cartpath | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Golf Cartpath
+        # 'terms: cartpath'
         terms: <translate with synonyms or related terms for 'Golf Cartpath', separated by commas>
       golf/clubhouse:
         # golf=clubhouse | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
@@ -5838,6 +5847,7 @@ en:
       golf/path:
         # golf=path | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Golf Walking Path
+        # 'terms: golf path'
         terms: <translate with synonyms or related terms for 'Golf Walking Path', separated by commas>
       golf/rough:
         # golf=rough | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).