diff --git a/data/core.yaml b/data/core.yaml
index 5cba09816..954249d4d 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1673,7 +1673,8 @@ en:
         reverse: "Reverse a line"
         move: "Move selected features"
         rotate: "Rotate selected features"
-        orthogonalize: "Straighten line / Square area corners"
+        orthogonalize: "Square corners of a line or area"
+        straighten: "Straighten a line"
         circularize: "Circularize a closed line or area"
         reflect_long: "Reflect features across the longer axis"
         reflect_short: "Reflect features across the shorter axis"
diff --git a/data/presets.yaml b/data/presets.yaml
index 4596b550b..02ff12baa 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3129,9 +3129,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Amusement Ride'', separated by commas>'
       attraction/animal:
         # attraction=animal
-        name: Animal
-        # 'terms: zoo,theme park,animal park,lion,tiger,bear'
-        terms: '<translate with synonyms or related terms for ''Animal'', separated by commas>'
+        name: Animal Enclosure
+        # 'terms: amphibian,animal park,aquarium,bear,bird,fish,insect,lion,mammal,monkey,penguin,reptile,safari,theme park,tiger,zoo'
+        terms: '<translate with synonyms or related terms for ''Animal Enclosure'', separated by commas>'
       attraction/big_wheel:
         # attraction=big_wheel
         name: Big Wheel
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6c6296a1f..dca17b874 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -225,7 +225,7 @@
     "area": {"fields": ["name"], "geometry": ["area"], "tags": {"area": "yes"}, "name": "Area", "matchScore": 0.1},
     "area/highway": {"fields": ["name", "area/highway"], "geometry": ["area"], "tags": {"area:highway": "*"}, "name": "Road Surface"},
     "attraction/amusement_ride": {"icon": "maki-amusement-park", "geometry": ["point", "area"], "terms": ["theme park", "carnival ride"], "tags": {"attraction": "amusement_ride"}, "name": "Amusement Ride"},
-    "attraction/animal": {"icon": "maki-zoo", "fields": ["name", "operator"], "geometry": ["point", "area"], "terms": ["zoo", "theme park", "animal park", "lion", "tiger", "bear"], "tags": {"attraction": "animal"}, "name": "Animal"},
+    "attraction/animal": {"icon": "maki-zoo", "fields": ["name", "operator"], "geometry": ["point", "area"], "terms": ["amphibian", "animal park", "aquarium", "bear", "bird", "fish", "insect", "lion", "mammal", "monkey", "penguin", "reptile", "safari", "theme park", "tiger", "zoo"], "tags": {"attraction": "animal"}, "name": "Animal Enclosure"},
     "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["{attraction}", "height"], "geometry": ["point"], "terms": ["ferris wheel", "theme park", "amusement ride"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"},
     "attraction/bumper_car": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["theme park", "dodgem cars", "autoscooter"], "tags": {"attraction": "bumper_car"}, "name": "Bumper Car"},
     "attraction/bungee_jumping": {"icon": "maki-pitch", "fields": ["{attraction}", "height"], "geometry": ["point", "area"], "terms": ["theme park", "bungy jumping", "jumping platform"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"},
diff --git a/data/presets/presets/attraction/animal.json b/data/presets/presets/attraction/animal.json
index e93614007..3d0761203 100644
--- a/data/presets/presets/attraction/animal.json
+++ b/data/presets/presets/attraction/animal.json
@@ -9,15 +9,25 @@
         "area"
     ],
     "terms": [
-        "zoo",
-        "theme park",
+        "amphibian",
         "animal park",
+        "aquarium",
+        "bear",
+        "bird",
+        "fish",
+        "insect",
         "lion",
+        "mammal",
+        "monkey",
+        "penguin",
+        "reptile",
+        "safari",
+        "theme park",
         "tiger",
-        "bear"
+        "zoo"
     ],
     "tags": {
         "attraction": "animal"
     },
-    "name": "Animal"
+    "name": "Animal Enclosure"
 }
diff --git a/data/shortcuts.json b/data/shortcuts.json
index 484de5af1..cdda16290 100644
--- a/data/shortcuts.json
+++ b/data/shortcuts.json
@@ -255,6 +255,10 @@
               "shortcuts": ["operations.orthogonalize.key"],
               "text": "shortcuts.editing.operations.orthogonalize"
             },
+            {
+              "shortcuts": ["operations.straighten.key"],
+              "text": "shortcuts.editing.operations.straighten"
+            },
             {
               "shortcuts": ["operations.circularize.key"],
               "text": "shortcuts.editing.operations.circularize"
diff --git a/data/taginfo.json b/data/taginfo.json
index aea9fb5e7..1f11b3ffe 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -222,7 +222,7 @@
     {"key": "area", "value": "yes", "description": "🄿 Area, 🄿 Pedestrian Area", "object_types": ["area"]},
     {"key": "area:highway", "description": "🄿 Road Surface, 🄵 Type", "object_types": ["area"]},
     {"key": "attraction", "value": "amusement_ride", "description": "🄿 Amusement Ride", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/amusement-park-15.svg?sanitize=true"},
-    {"key": "attraction", "value": "animal", "description": "🄿 Animal", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/zoo-15.svg?sanitize=true"},
+    {"key": "attraction", "value": "animal", "description": "🄿 Animal Enclosure", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/zoo-15.svg?sanitize=true"},
     {"key": "attraction", "value": "big_wheel", "description": "🄿 Big Wheel", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/amusement-park-15.svg?sanitize=true"},
     {"key": "attraction", "value": "bumper_car", "description": "🄿 Bumper Car", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
     {"key": "attraction", "value": "bungee_jumping", "description": "🄿 Bungee Jumping", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 477ec20ae..4ff7c9bc6 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2017,7 +2017,8 @@
                     "reverse": "Reverse a line",
                     "move": "Move selected features",
                     "rotate": "Rotate selected features",
-                    "orthogonalize": "Straighten line / Square area corners",
+                    "orthogonalize": "Square corners of a line or area",
+                    "straighten": "Straighten a line",
                     "circularize": "Circularize a closed line or area",
                     "reflect_long": "Reflect features across the longer axis",
                     "reflect_short": "Reflect features across the shorter axis",
@@ -4810,8 +4811,8 @@
                     "terms": "theme park,carnival ride"
                 },
                 "attraction/animal": {
-                    "name": "Animal",
-                    "terms": "zoo,theme park,animal park,lion,tiger,bear"
+                    "name": "Animal Enclosure",
+                    "terms": "amphibian,animal park,aquarium,bear,bird,fish,insect,lion,mammal,monkey,penguin,reptile,safari,theme park,tiger,zoo"
                 },
                 "attraction/big_wheel": {
                     "name": "Big Wheel",