diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 76bf4555..33e4965c 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -1915,6 +1915,19 @@ en:
         label: Par
         # par field placeholder
         placeholder: '3, 4, 5...'
+      parcel_dropoff:
+        # parcel_mail_in=*
+        label: Parcel Dropoff
+      parcel_pickup:
+        # parcel_pickup=*
+        label: Parcel Pickup
+        options:
+          # parcel_pickup=no
+          'no': 'No'
+          # parcel_pickup=undefined
+          undefined: Assumed to be Yes
+          # parcel_pickup=yes
+          'yes': 'Yes'
       park_ride:
         # park_ride=*
         label: Park and Ride
@@ -3956,6 +3969,11 @@ en:
       amenity/nursing_home:
         # 'amenity=nursing_home\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Nursing Home
+      amenity/parcel_locker:
+        # 'amenity=parcel_locker\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
+        name: Parcel Locker
+        # 'terms: automated postal box,dropoff,locker,mail,packstation,parcel,pickup'
+        terms: '<translate with synonyms or related terms for ''Parcel Locker'', separated by commas>'
       amenity/parking:
         # 'amenity=parking\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Parking Lot
@@ -4535,16 +4553,6 @@ en:
         name: Newspaper Vending Machine
         # 'terms: newspaper'
         terms: '<translate with synonyms or related terms for ''Newspaper Vending Machine'', separated by commas>'
-      amenity/vending_machine/parcel_pickup:
-        # 'amenity=vending_machine + vending=parcel_pickup\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Parcel Pickup Locker
-        # 'terms: amazon,locker,mail,packstation,parcel,pickup'
-        terms: '<translate with synonyms or related terms for ''Parcel Pickup Locker'', separated by commas>'
-      amenity/vending_machine/parcel_pickup_dropoff:
-        # 'amenity=vending_machine + vending=parcel_pickup;parcel_mail_in\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
-        name: Parcel Pickup/Dropoff Locker
-        # 'terms: mail,packstation,parcel,pickup'
-        terms: '<translate with synonyms or related terms for ''Parcel Pickup/Dropoff Locker'', separated by commas>'
       amenity/vending_machine/parking_tickets:
         # 'amenity=vending_machine + vending=parking_tickets\n\nParking Meter\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Parking Ticket Vending Machine