diff --git a/data/deprecated.json b/data/deprecated.json
index 74fc37e4..2a3d71a5 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -1205,6 +1205,14 @@
     "old": {"parking": "street"},
     "replace": {"parking": "lane"}
   },
+  {
+    "old": {"parking:orientation": "*"},
+    "replace": {"orientation": "$1"}
+  },
+  {
+    "old": {"orientation": "orthogonal"},
+    "replace": {"orientation": "perpendicular"}
+  },
   {
     "old": {"parking:orientation": "orthogonal"},
     "replace": {"parking:orientation": "perpendicular"}
diff --git a/data/fields/parking/orientation.json b/data/fields/orientation/orientation_parking.json
similarity index 90%
rename from data/fields/parking/orientation.json
rename to data/fields/orientation/orientation_parking.json
index a6cb4582..6de35ffd 100644
--- a/data/fields/parking/orientation.json
+++ b/data/fields/orientation/orientation_parking.json
@@ -1,5 +1,5 @@
 {
-    "key": "parking:orientation",
+    "key": "orientation",
     "type": "combo",
     "label": "Orientation",
     "strings": {
diff --git a/data/presets/amenity/parking/street-side.json b/data/presets/amenity/parking/street-side.json
index 4393b6b0..0ec0f4bc 100644
--- a/data/presets/amenity/parking/street-side.json
+++ b/data/presets/amenity/parking/street-side.json
@@ -2,7 +2,7 @@
     "icon": "temaki-car_parked",
     "fields": [
         "{amenity/parking}",
-        "parking/orientation"
+        "orientation/orientation_parking"
     ],
     "geometry": [
         "area",