diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -1175,7 +1175,7 @@ STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}通過点の種類を選択します
 
 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}通過点名を変更
 
 STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}通過点名を変更できません...
@@ -1755,10 +1755,10 @@ STR_TOWN_BUILDING_NAME_TEPEES_1                                 :テント
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :茶瓶小屋
 STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :ブタ型貯金箱
 
-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                                :地形
@@ -2148,7 +2148,7 @@ STR_CITY_APPROVAL_HOSTILE                                       :対立
 
 ##id 0x7000
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
-STR_COMPANY_NUM                                                 :（会社 {COMMA}）
+STR_FORMAT_COMPANY_NUM                                          :（会社 {COMMA}）
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}新規顔
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}カラースキーム
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}カラースキーム：
@@ -3329,10 +3329,10 @@ STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}長さ：{NUM}{}高さの違い：{NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}地域：{NUM} x {NUM}{}高さの違い：{NUM} m
 
 ############ Date formatting
-STR_DATE_TINY                                                   :{2:NUM}-{1:STRING}-{0:STRING}
-STR_DATE_SHORT                                                  :{1:NUM}年{0:STRING}
-STR_DATE_LONG                                                   :{2:NUM}年{1:STRING}{0:STRING}
-STR_DATE_ISO                                                    :{2:NUM}-{1:STRING}-{0:STRING}
+STR_FORMAT_DATE_TINY                                            :{2:NUM}-{1:STRING}-{0:STRING}
+STR_FORMAT_DATE_SHORT                                           :{1:NUM}年{0:STRING}
+STR_FORMAT_DATE_LONG                                            :{2:NUM}年{1:STRING}{0:STRING}
+STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
@@ -3363,7 +3363,7 @@ STR_PERCENT_UP_DOWN_SMALL               
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_NAME_FORMAT                                           :グループ {COMMA}
+STR_FORMAT_GROUP_NAME                                           :グループ {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :すべての列車
 STR_GROUP_ALL_ROADS                                             :すべての道路車両