diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -1198,7 +1198,7 @@ STR_WAYPOINT_GRAPHICS_TIP               
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
-STR_WAYPOINT_RAW                                                :{WAYPOINT}
+STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Ŝanĝu trairejan nomon
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Ne povas ŝanĝi trairejan nomon...
@@ -1734,10 +1734,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1         
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Tekruĉa Domo
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Porko-Banko
 
-STR_INDUSTRY                                                    :{INDUSTRY}
-STR_TOWN                                                        :{TOWN}
-STR_INDUSTRY_FORMAT                                             :{TOWN} {STRING}
-STR_STATION                                                     :{STATION}
+STR_INDUSTRY_NAME                                               :{INDUSTRY}
+STR_TOWN_NAME                                                   :{TOWN}
+STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
+STR_STATION_NAME                                                :{STATION}
 
 ##id 0x2800
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Landaspektigi
@@ -3112,9 +3112,9 @@ STR_MEASURE_LENGTH_HEIGHTDIFF           
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Regiono: {NUM} x {NUM}{}Altecdiferenco: {NUM} m
 
 ############ Date formatting
-STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
-STR_DATE_SHORT                                                  :{STRING} {NUM}
-STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+STR_FORMAT_DATE_TINY                                            :{STRING}-{STRING}-{NUM}
+STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
+STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 
 ########
 
@@ -3139,7 +3139,7 @@ STR_PERCENT_UP_DOWN_SMALL               
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_NAME_FORMAT                                           :Group {COMMA}
+STR_FORMAT_GROUP_NAME                                           :Group {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Ĉiuj trajnoj
 STR_GROUP_ALL_SHIPS                                             :Ĉiuj ŝipoj