diff --git a/Makefile b/Makefile
index f12faabb9..534858e7f 100644
--- a/Makefile
+++ b/Makefile
@@ -311,7 +311,7 @@ SOURCES += gui/components/gui_fixedwidth_textarea.cc
 SOURCES += gui/components/gui_flowtext.cc
 SOURCES += gui/components/gui_image.cc
 SOURCES += gui/components/gui_image_list.cc
-SOURCES += gui/components/gui_komponente.cc
+SOURCES += gui/components/gui_component.cc
 SOURCES += gui/components/gui_label.cc
 SOURCES += gui/components/gui_map_preview.cc
 SOURCES += gui/components/gui_numberinput.cc
diff --git a/Simutrans-SDL2.vcxproj b/Simutrans-SDL2.vcxproj
index b1700be4b..4fe6bbc33 100644
--- a/Simutrans-SDL2.vcxproj
+++ b/Simutrans-SDL2.vcxproj
@@ -140,7 +140,7 @@
     <ClCompile Include="gui\components\gui_container.cc" />
     <ClCompile Include="gui\components\gui_convoiinfo.cc" />
     <ClCompile Include="gui\components\gui_image.cc" />
-    <ClCompile Include="gui\components\gui_komponente.cc" />
+    <ClCompile Include="gui\components\gui_component.cc" />
     <ClCompile Include="gui\components\gui_map_preview.cc" />
     <ClCompile Include="gui\gui_theme.cc" />
     <ClCompile Include="gui\loadfont_frame.cc" />
@@ -553,7 +553,7 @@
     <ClInclude Include="gui\gui_frame.h" />
     <ClInclude Include="gui\components\gui_image.h" />
     <ClInclude Include="gui\components\gui_image_list.h" />
-    <ClInclude Include="gui\components\gui_komponente.h" />
+    <ClInclude Include="gui\components\gui_component.h" />
     <ClInclude Include="gui\components\gui_label.h" />
     <ClInclude Include="gui\components\gui_numberinput.h" />
     <ClInclude Include="gui\components\gui_scrollbar.h" />
diff --git a/Simutrans.vcxproj b/Simutrans.vcxproj
index 06663328f..10da9ceab 100644
--- a/Simutrans.vcxproj
+++ b/Simutrans.vcxproj
@@ -139,7 +139,7 @@
     <ClCompile Include="gui\components\gui_container.cc" />
     <ClCompile Include="gui\components\gui_convoiinfo.cc" />
     <ClCompile Include="gui\components\gui_image.cc" />
-    <ClCompile Include="gui\components\gui_komponente.cc" />
+    <ClCompile Include="gui\components\gui_component.cc" />
     <ClCompile Include="gui\components\gui_map_preview.cc" />
     <ClCompile Include="gui\gui_theme.cc" />
     <ClCompile Include="gui\loadfont_frame.cc" />
@@ -553,7 +553,7 @@
     <ClInclude Include="gui\gui_frame.h" />
     <ClInclude Include="gui\components\gui_image.h" />
     <ClInclude Include="gui\components\gui_image_list.h" />
-    <ClInclude Include="gui\components\gui_komponente.h" />
+    <ClInclude Include="gui\components\gui_component.h" />
     <ClInclude Include="gui\components\gui_label.h" />
     <ClInclude Include="gui\components\gui_numberinput.h" />
     <ClInclude Include="gui\components\gui_scrollbar.h" />
diff --git a/gui/components/gui_button.h b/gui/components/gui_button.h
index 280382e91..ced42b068 100644
--- a/gui/components/gui_button.h
+++ b/gui/components/gui_button.h
@@ -13,7 +13,7 @@
 #define gui_button_h
 
 #include "gui_action_creator.h"
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../simcolor.h"
 #include "../../dataobj/koord.h"
 #include "../../display/simimg.h"
diff --git a/gui/components/gui_chart.h b/gui/components/gui_chart.h
index ecc50d2ad..af33c56c1 100644
--- a/gui/components/gui_chart.h
+++ b/gui/components/gui_chart.h
@@ -7,7 +7,7 @@
 #define gui_chart_h
 
 #include "../../simtypes.h"
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../tpl/slist_tpl.h"
 
 // CURVE TYPES
diff --git a/gui/components/gui_komponente.cc b/gui/components/gui_component.cc
similarity index 99%
rename from gui/components/gui_komponente.cc
rename to gui/components/gui_component.cc
index 019dfbd8c..7ba60a935 100644
--- a/gui/components/gui_komponente.cc
+++ b/gui/components/gui_component.cc
@@ -1,4 +1,4 @@
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../display/scr_coord.h"
 
 #include "../../simworld.h"
diff --git a/gui/components/gui_komponente.h b/gui/components/gui_component.h
similarity index 100%
rename from gui/components/gui_komponente.h
rename to gui/components/gui_component.h
diff --git a/gui/components/gui_container.h b/gui/components/gui_container.h
index 58170c23e..1fa1991a4 100644
--- a/gui/components/gui_container.h
+++ b/gui/components/gui_container.h
@@ -20,7 +20,7 @@
 #include "../../simdebug.h"
 #include "../../simevent.h"
 #include "../../tpl/slist_tpl.h"
-#include "gui_komponente.h"
+#include "gui_component.h"
 
 class gui_container_t : public gui_component_t
 {
diff --git a/gui/components/gui_divider.h b/gui/components/gui_divider.h
index fdad41b80..78f65efe8 100644
--- a/gui/components/gui_divider.h
+++ b/gui/components/gui_divider.h
@@ -9,7 +9,7 @@
 #ifndef gui_components_gui_divider_h
 #define gui_components_gui_divider_h
 
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../display/simgraph.h"
 #include "../../simskin.h"
 
diff --git a/gui/components/gui_fixedwidth_textarea.h b/gui/components/gui_fixedwidth_textarea.h
index 936434d19..227c0852d 100644
--- a/gui/components/gui_fixedwidth_textarea.h
+++ b/gui/components/gui_fixedwidth_textarea.h
@@ -8,7 +8,7 @@
 #ifndef gui_fixedwidth_textarea_h
 #define gui_fixedwidth_textarea_h
 
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "gui_container.h"
 #include "../../display/simgraph.h"
 
diff --git a/gui/components/gui_flowtext.h b/gui/components/gui_flowtext.h
index 0a2b569e1..bcbc5c1c5 100644
--- a/gui/components/gui_flowtext.h
+++ b/gui/components/gui_flowtext.h
@@ -4,7 +4,7 @@
 #include <string>
 
 #include "gui_action_creator.h"
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../tpl/slist_tpl.h"
 
 
diff --git a/gui/components/gui_image.h b/gui/components/gui_image.h
index f059221e6..044d7627c 100644
--- a/gui/components/gui_image.h
+++ b/gui/components/gui_image.h
@@ -12,7 +12,7 @@
 
 #include "../../display/simimg.h"
 #include "../../display/simgraph.h"
-#include "gui_komponente.h"
+#include "gui_component.h"
 
 
 
diff --git a/gui/components/gui_image_list.h b/gui/components/gui_image_list.h
index ff9edaab2..7abf1beea 100644
--- a/gui/components/gui_image_list.h
+++ b/gui/components/gui_image_list.h
@@ -2,7 +2,7 @@
 #define gui_image_list_h
 
 #include "gui_action_creator.h"
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../tpl/vector_tpl.h"
 #include "../../display/simimg.h"
 #include "../../simcolor.h"
diff --git a/gui/components/gui_label.h b/gui/components/gui_label.h
index 77e0f4764..b5cda219d 100644
--- a/gui/components/gui_label.h
+++ b/gui/components/gui_label.h
@@ -10,7 +10,7 @@
 #ifndef gui_gui_label_h
 #define gui_gui_label_h
 
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../simcolor.h"
 #include "../gui_theme.h"
 #include "../../simskin.h"
diff --git a/gui/components/gui_map_preview.h b/gui/components/gui_map_preview.h
index 002733020..4031b34e5 100644
--- a/gui/components/gui_map_preview.h
+++ b/gui/components/gui_map_preview.h
@@ -10,7 +10,7 @@
 #ifndef gui_gui_map_preview_h
 #define gui_gui_map_preview_h
 
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../simcolor.h"
 #include "../../display/simgraph.h"
 #include "../../tpl/array2d_tpl.h"
diff --git a/gui/components/gui_scrollpane.h b/gui/components/gui_scrollpane.h
index 83b755a05..2626a1663 100644
--- a/gui/components/gui_scrollpane.h
+++ b/gui/components/gui_scrollpane.h
@@ -11,7 +11,7 @@
 #define gui_scrollpane_h
 
 
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "gui_scrollbar.h"
 
 class gui_scrollpane_t : public gui_component_t
diff --git a/gui/components/gui_speedbar.h b/gui/components/gui_speedbar.h
index 447b558df..510b89921 100644
--- a/gui/components/gui_speedbar.h
+++ b/gui/components/gui_speedbar.h
@@ -8,7 +8,7 @@
 #ifndef gui_components_gui_speedbar_h
 #define gui_components_gui_speedbar_h
 
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../tpl/slist_tpl.h"
 
 
diff --git a/gui/components/gui_tab_panel.h b/gui/components/gui_tab_panel.h
index 2500c7aad..bf21b5cfc 100644
--- a/gui/components/gui_tab_panel.h
+++ b/gui/components/gui_tab_panel.h
@@ -11,7 +11,7 @@
 #include "../../descriptor/skin_desc.h"
 
 #include "gui_action_creator.h"
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "gui_button.h"
 
 class image_t;
diff --git a/gui/components/gui_textarea.h b/gui/components/gui_textarea.h
index 2cbebc137..833cd6e81 100644
--- a/gui/components/gui_textarea.h
+++ b/gui/components/gui_textarea.h
@@ -14,7 +14,7 @@
 #ifndef gui_textarea_h
 #define gui_textarea_h
 
-#include "gui_komponente.h"
+#include "gui_component.h"
 
 class cbuffer_t;
 
diff --git a/gui/components/gui_textinput.h b/gui/components/gui_textinput.h
index 401d70972..56fdfc434 100644
--- a/gui/components/gui_textinput.h
+++ b/gui/components/gui_textinput.h
@@ -17,7 +17,7 @@
 #define gui_components_gui_textinput_h
 
 #include "gui_action_creator.h"
-#include "gui_komponente.h"
+#include "gui_component.h"
 #include "../../simcolor.h"
 #include "../../display/simgraph.h"
 #include "../../utils/cbuffer_t.h"
diff --git a/gui/components/gui_world_view_t.h b/gui/components/gui_world_view_t.h
index c2ecae97e..8904cddcc 100644
--- a/gui/components/gui_world_view_t.h
+++ b/gui/components/gui_world_view_t.h
@@ -8,7 +8,7 @@
 #ifndef world_view_t_h
 #define world_view_t_h
 
-#include "gui_komponente.h"
+#include "gui_component.h"
 
 #include "../../dataobj/koord3d.h"
 #include "../../tpl/vector_tpl.h"
diff --git a/gui/curiositylist_stats_t.h b/gui/curiositylist_stats_t.h
index 4aa7bba5d..1fe12e5d5 100644
--- a/gui/curiositylist_stats_t.h
+++ b/gui/curiositylist_stats_t.h
@@ -14,7 +14,7 @@
 #define curiositylist_stats_t_h
 
 #include "../tpl/vector_tpl.h"
-#include "components/gui_komponente.h"
+#include "components/gui_component.h"
 #include "components/gui_button.h"
 
 class gebaeude_t;
diff --git a/gui/goods_stats_t.h b/gui/goods_stats_t.h
index 43b972f8a..2d67d0708 100644
--- a/gui/goods_stats_t.h
+++ b/gui/goods_stats_t.h
@@ -15,7 +15,7 @@
 #define good_stats_t_h
 
 #include "../simtypes.h"
-#include "components/gui_komponente.h"
+#include "components/gui_component.h"
 
 
 
diff --git a/gui/halt_list_stats.h b/gui/halt_list_stats.h
index fcbe4576a..0a90159b5 100644
--- a/gui/halt_list_stats.h
+++ b/gui/halt_list_stats.h
@@ -9,7 +9,7 @@
 #ifndef halt_list_stats_h
 #define halt_list_stats_h
 
-#include "components/gui_komponente.h"
+#include "components/gui_component.h"
 #include "../halthandle_t.h"
 
 
diff --git a/gui/karte.h b/gui/karte.h
index 745dad730..9c4e0ffb9 100644
--- a/gui/karte.h
+++ b/gui/karte.h
@@ -1,7 +1,7 @@
 #ifndef gui_karte_h
 #define gui_karte_h
 
-#include "components/gui_komponente.h"
+#include "components/gui_component.h"
 #include "../halthandle_t.h"
 #include "../simline.h"
 #include "../convoihandle_t.h"
diff --git a/gui/labellist_stats_t.h b/gui/labellist_stats_t.h
index 459e1ca91..bed0ebe93 100644
--- a/gui/labellist_stats_t.h
+++ b/gui/labellist_stats_t.h
@@ -9,7 +9,7 @@
 #define labellist_stats_t_h
 
 #include "../tpl/vector_tpl.h"
-#include "components/gui_komponente.h"
+#include "components/gui_component.h"
 #include "components/gui_button.h"
 
 
diff --git a/gui/message_stats_t.h b/gui/message_stats_t.h
index eeb5a1df0..92f49bffc 100644
--- a/gui/message_stats_t.h
+++ b/gui/message_stats_t.h
@@ -8,7 +8,7 @@
 #ifndef message_stats_t_h
 #define message_stats_t_h
 
-#include "components/gui_komponente.h"
+#include "components/gui_component.h"
 #include "../display/simimg.h"
 #include "../simmesg.h"
 #include "../tpl/slist_tpl.h"
diff --git a/gui/settings_stats.h b/gui/settings_stats.h
index e8d20e521..d9d940946 100644
--- a/gui/settings_stats.h
+++ b/gui/settings_stats.h
@@ -15,7 +15,7 @@
 #include "../utils/cbuffer_t.h"
 
 #include "components/gui_container.h"
-#include "components/gui_komponente.h"
+#include "components/gui_component.h"
 #include "components/gui_numberinput.h"
 #include "components/gui_label.h"
 
diff --git a/simsys_s2.cc b/simsys_s2.cc
index d6fac0588..3460aca68 100644
--- a/simsys_s2.cc
+++ b/simsys_s2.cc
@@ -29,7 +29,7 @@ extern char **__argv;
 #include "simdebug.h"
 #include "dataobj/environment.h"
 #include "gui/simwin.h"
-#include "gui/components/gui_komponente.h"
+#include "gui/components/gui_component.h"
 #include "gui/components/gui_textinput.h"
 
 // Maybe Linux is not fine too, had critical bugs...
diff --git a/simsys_w.cc b/simsys_w.cc
index 8ef940eb2..23793b15e 100644
--- a/simsys_w.cc
+++ b/simsys_w.cc
@@ -28,7 +28,7 @@ extern char **__argv;
 #include "simdebug.h"
 #include "gui/simwin.h"
 #include "gui/gui_frame.h"
-#include "gui/components/gui_komponente.h"
+#include "gui/components/gui_component.h"
 #include "gui/components/gui_textinput.h"