diff --git a/AnimModel.cpp b/AnimModel.cpp
index 41d2f4a9..92e55bf6 100644
--- a/AnimModel.cpp
+++ b/AnimModel.cpp
@@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 #include "AnimModel.h"
 
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "MdlMngr.h"
 #include "simulation.h"
 #include "simulationtime.h"
@@ -23,7 +23,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Globals.h"
 #include "Timer.h"
 #include "Logs.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 std::list<std::weak_ptr<TAnimContainer>> TAnimModel::acAnimList;
 
diff --git a/Button.cpp b/Button.cpp
index c1cb3d48..aeb15fb5 100644
--- a/Button.cpp
+++ b/Button.cpp
@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
 #include "DynObj.h"
 #include "Console.h"
 #include "Logs.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 void TButton::Clear(int i)
 {
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e10c2aeb..8293aac0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ set(SOURCES
 "Model3d.cpp"
 "mtable.cpp"
 "parser.cpp"
-"renderer.cpp"
+"opengl33renderer.cpp"
 "PyInt.cpp"
 "ResourceManager.cpp"
 "sn_utils.cpp"
@@ -83,7 +83,7 @@ set(SOURCES
 "sun.cpp"
 "stars.cpp"
 "lightarray.cpp"
-"skydome.cpp"
+"opengl33skydome.cpp"
 "sound.cpp"
 "Spring.cpp"
 "frustum.cpp"
@@ -93,7 +93,7 @@ set(SOURCES
 "command.cpp"
 "keyboardinput.cpp"
 "gamepadinput.cpp"
-"openglgeometrybank.cpp"
+"opengl33geometrybank.cpp"
 "drivermouseinput.cpp"
 "translation.cpp"
 "material.cpp"
@@ -127,10 +127,10 @@ set(SOURCES
 "scenenodegroups.cpp"
 "simulationenvironment.cpp"
 "simulationstateserializer.cpp"
-"precipitation.cpp"
+"opengl33precipitation.cpp"
 "pythonscreenviewer.cpp"
 "dictionary.cpp"
-"particles.cpp"
+"opengl33particles.cpp"
 "headtrack.cpp"
 "headtrack.h"
 
diff --git a/DynObj.cpp b/DynObj.cpp
index 49075ccb..268da1c0 100644
--- a/DynObj.cpp
+++ b/DynObj.cpp
@@ -27,7 +27,7 @@ http://mozilla.org/MPL/2.0/.
 #include "sound.h"
 #include "MdlMngr.h"
 #include "Model3d.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "uitranscripts.h"
 #include "messaging.h"
 
diff --git a/Gauge.cpp b/Gauge.cpp
index c135e18f..8a1adcd6 100644
--- a/Gauge.cpp
+++ b/Gauge.cpp
@@ -20,7 +20,7 @@ http://mozilla.org/MPL/2.0/.
 #include "DynObj.h"
 #include "Timer.h"
 #include "Logs.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 TGauge::TGauge( sound_source const &Soundtemplate ) :
     m_soundtemplate( Soundtemplate )
diff --git a/Model3d.cpp b/Model3d.cpp
index c229f6fa..4127bb97 100644
--- a/Model3d.cpp
+++ b/Model3d.cpp
@@ -18,7 +18,7 @@ Copyright (C) 2001-2004  Marcin Wozniak, Maciej Czapkiewicz and others
 #include "Globals.h"
 #include "Logs.h"
 #include "utilities.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Timer.h"
 #include "simulation.h"
 #include "simulationtime.h"
diff --git a/Model3d.h b/Model3d.h
index 3bff57c6..d075d36f 100644
--- a/Model3d.h
+++ b/Model3d.h
@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Classes.h"
 #include "dumb3d.h"
 #include "Float3d.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 #include "material.h"
 #include "gl/query.h"
 
diff --git a/Segment.cpp b/Segment.cpp
index 5db4fd16..be2ada52 100644
--- a/Segment.cpp
+++ b/Segment.cpp
@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Logs.h"
 #include "utilities.h"
 #include "Track.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 void
 segment_data::deserialize( cParser &Input, glm::dvec3 const &Offset ) {
diff --git a/Segment.h b/Segment.h
index 8c1b02cd..ae18f632 100644
--- a/Segment.h
+++ b/Segment.h
@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
 
 #include "Classes.h"
 #include "dumb3d.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 #include "utilities.h"
 
 struct map_colored_paths {
diff --git a/Track.cpp b/Track.cpp
index 2b0737c9..3ab29a74 100644
--- a/Track.cpp
+++ b/Track.cpp
@@ -24,7 +24,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Track.h"
 #include "Timer.h"
 #include "Logs.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "utilities.h"
 
 // 101206 Ra: trapezoidalne drogi i tory
diff --git a/Traction.cpp b/Traction.cpp
index 1dfa5ed9..26952314 100644
--- a/Traction.cpp
+++ b/Traction.cpp
@@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Globals.h"
 #include "TractionPower.h"
 #include "Logs.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "utilities.h"
 
 //---------------------------------------------------------------------------
diff --git a/Train.cpp b/Train.cpp
index 4a63d5ca..2329d20d 100644
--- a/Train.cpp
+++ b/Train.cpp
@@ -30,7 +30,7 @@ http://mozilla.org/MPL/2.0/.
 #include "mtable.h"
 #include "Console.h"
 #include "application.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "dictionary.h"
 /*
 namespace input {
diff --git a/application.cpp b/application.cpp
index f11edc08..9d8e8a91 100644
--- a/application.cpp
+++ b/application.cpp
@@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Train.h"
 #include "dictionary.h"
 #include "sceneeditor.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "uilayer.h"
 #include "Logs.h"
 #include "screenshot.h"
diff --git a/drivermode.cpp b/drivermode.cpp
index 90d4bdaf..5396953c 100644
--- a/drivermode.cpp
+++ b/drivermode.cpp
@@ -17,7 +17,7 @@ http://mozilla.org/MPL/2.0/.
 #include "simulationtime.h"
 #include "simulationenvironment.h"
 #include "lightarray.h"
-#include "particles.h"
+#include "opengl33particles.h"
 #include "Train.h"
 #include "Driver.h"
 #include "DynObj.h"
@@ -25,7 +25,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Event.h"
 #include "messaging.h"
 #include "Timer.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "utilities.h"
 #include "Logs.h"
 /*
diff --git a/drivermouseinput.cpp b/drivermouseinput.cpp
index b17766bf..873156f2 100644
--- a/drivermouseinput.cpp
+++ b/drivermouseinput.cpp
@@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/.
 #include "simulation.h"
 #include "Train.h"
 #include "AnimModel.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "uilayer.h"
 #include "Logs.h"
 
diff --git a/driveruilayer.cpp b/driveruilayer.cpp
index 5cce786e..b68cf74b 100644
--- a/driveruilayer.cpp
+++ b/driveruilayer.cpp
@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
 #include "simulation.h"
 #include "Train.h"
 #include "AnimModel.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 driver_ui::driver_ui() {
 
diff --git a/driveruipanels.cpp b/driveruipanels.cpp
index 7f229646..c6dd2ba3 100644
--- a/driveruipanels.cpp
+++ b/driveruipanels.cpp
@@ -24,7 +24,7 @@ http://mozilla.org/MPL/2.0/.
 #include "AnimModel.h"
 #include "DynObj.h"
 #include "Model3d.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "utilities.h"
 #include "Logs.h"
 #include "widgets/vehicleparams.h"
diff --git a/editormode.cpp b/editormode.cpp
index bab21c51..df4cfe30 100644
--- a/editormode.cpp
+++ b/editormode.cpp
@@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/.
 #include "simulationenvironment.h"
 #include "Timer.h"
 #include "Console.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "AnimModel.h"
 
 bool
diff --git a/editoruilayer.cpp b/editoruilayer.cpp
index 7d3a9171..1b1f7c69 100644
--- a/editoruilayer.cpp
+++ b/editoruilayer.cpp
@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
 #include "editoruilayer.h"
 
 #include "Globals.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 editor_ui::editor_ui() {
 
diff --git a/editoruipanels.cpp b/editoruipanels.cpp
index 2dd2f6c8..69391cef 100644
--- a/editoruipanels.cpp
+++ b/editoruipanels.cpp
@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
 #include "AnimModel.h"
 #include "Track.h"
 #include "Event.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "utilities.h"
 
 void
diff --git a/launcher/deferred_image.h b/launcher/deferred_image.h
index 10f557fc..4f100de0 100644
--- a/launcher/deferred_image.h
+++ b/launcher/deferred_image.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Texture.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 class deferred_image {
 public:
diff --git a/launcher/scenery_list.cpp b/launcher/scenery_list.cpp
index 99d1e80a..6bb7944d 100644
--- a/launcher/scenery_list.cpp
+++ b/launcher/scenery_list.cpp
@@ -2,7 +2,7 @@
 #include "scenery_list.h"
 #include "imgui/imgui.h"
 #include "utilities.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "McZapkie/MOVER.h"
 #include "application.h"
 #include "Logs.h"
diff --git a/launcher/vehicle_picker.cpp b/launcher/vehicle_picker.cpp
index 4ab5503a..645f432d 100644
--- a/launcher/vehicle_picker.cpp
+++ b/launcher/vehicle_picker.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "launcher/vehicle_picker.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 ui::vehiclepicker_panel::vehiclepicker_panel()
     : ui_panel(STR("Select vehicle"), false), placeholder_mini("textures/mini/other")
diff --git a/material.cpp b/material.cpp
index 33d89105..dae9f6f1 100644
--- a/material.cpp
+++ b/material.cpp
@@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 
 #include "material.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Globals.h"
 #include "utilities.h"
 #include "Logs.h"
diff --git a/openglgeometrybank.cpp b/opengl33geometrybank.cpp
similarity index 99%
rename from openglgeometrybank.cpp
rename to opengl33geometrybank.cpp
index c4016f45..9ffba169 100644
--- a/openglgeometrybank.cpp
+++ b/opengl33geometrybank.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 
 #include "sn_utils.h"
 #include "Logs.h"
diff --git a/openglgeometrybank.h b/opengl33geometrybank.h
similarity index 100%
rename from openglgeometrybank.h
rename to opengl33geometrybank.h
diff --git a/particles.cpp b/opengl33particles.cpp
similarity index 99%
rename from particles.cpp
rename to opengl33particles.cpp
index 18c85f30..8270c010 100644
--- a/particles.cpp
+++ b/opengl33particles.cpp
@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "particles.h"
+#include "opengl33particles.h"
 
 #include "Timer.h"
 #include "Globals.h"
diff --git a/particles.h b/opengl33particles.h
similarity index 100%
rename from particles.h
rename to opengl33particles.h
diff --git a/precipitation.cpp b/opengl33precipitation.cpp
similarity index 99%
rename from precipitation.cpp
rename to opengl33precipitation.cpp
index 0ac9452a..6b98ef7c 100644
--- a/precipitation.cpp
+++ b/opengl33precipitation.cpp
@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "precipitation.h"
+#include "opengl33precipitation.h"
 
 #include "Globals.h"
 #include "openglmatrixstack.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Timer.h"
 #include "simulation.h"
 #include "Train.h"
diff --git a/precipitation.h b/opengl33precipitation.h
similarity index 100%
rename from precipitation.h
rename to opengl33precipitation.h
diff --git a/renderer.cpp b/opengl33renderer.cpp
similarity index 99%
rename from renderer.cpp
rename to opengl33renderer.cpp
index 5588b9af..dcca001e 100644
--- a/renderer.cpp
+++ b/opengl33renderer.cpp
@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #include "stdafx.h"
 
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "color.h"
 #include "Globals.h"
 #include "Timer.h"
diff --git a/renderer.h b/opengl33renderer.h
similarity index 99%
rename from renderer.h
rename to opengl33renderer.h
index 43b12f37..19cc113e 100644
--- a/renderer.h
+++ b/opengl33renderer.h
@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 #include "material.h"
 #include "light.h"
 #include "lightarray.h"
@@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/.
 #include "MemCell.h"
 #include "scene.h"
 #include "light.h"
-#include "particles.h"
+#include "opengl33particles.h"
 #include "vr/vr_interface.h"
 #include "gl/ubo.h"
 #include "gl/framebuffer.h"
diff --git a/skydome.cpp b/opengl33skydome.cpp
similarity index 99%
rename from skydome.cpp
rename to opengl33skydome.cpp
index 514d57f9..d16763ce 100644
--- a/skydome.cpp
+++ b/opengl33skydome.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "skydome.h"
+#include "opengl33skydome.h"
 #include "color.h"
 #include "utilities.h"
 
diff --git a/skydome.h b/opengl33skydome.h
similarity index 100%
rename from skydome.h
rename to opengl33skydome.h
diff --git a/pythonscreenviewer.h b/pythonscreenviewer.h
index afd22d36..17838d9c 100644
--- a/pythonscreenviewer.h
+++ b/pythonscreenviewer.h
@@ -1,4 +1,4 @@
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "PyInt.h"
 #include <GLFW/glfw3.h>
 
diff --git a/scenarioloadermode.cpp b/scenarioloadermode.cpp
index 92e02493..b28bf530 100644
--- a/scenarioloadermode.cpp
+++ b/scenarioloadermode.cpp
@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Timer.h"
 #include "application.h"
 #include "scenarioloaderuilayer.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Logs.h"
 #include "translation.h"
 
diff --git a/scene.cpp b/scene.cpp
index c6186549..5e3c6c17 100644
--- a/scene.cpp
+++ b/scene.cpp
@@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Timer.h"
 #include "Logs.h"
 #include "sn_utils.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "widgets/map_objects.h"
 
 namespace scene {
diff --git a/scene.h b/scene.h
index 17e525dc..7a24aa31 100644
--- a/scene.h
+++ b/scene.h
@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
 #include <unordered_set>
 
 #include "parser.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 #include "scenenode.h"
 #include "Track.h"
 #include "Traction.h"
diff --git a/sceneeditor.cpp b/sceneeditor.cpp
index 6b730a83..8679eee9 100644
--- a/sceneeditor.cpp
+++ b/sceneeditor.cpp
@@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/.
 #include "simulation.h"
 #include "Camera.h"
 #include "AnimModel.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 namespace scene {
 
diff --git a/scenenode.cpp b/scenenode.cpp
index bc8ccb74..0cec9dfd 100644
--- a/scenenode.cpp
+++ b/scenenode.cpp
@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
 #include "scenenode.h"
 
 #include "Model3d.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Logs.h"
 #include "sn_utils.h"
 
diff --git a/scenenode.h b/scenenode.h
index 66c1487d..6ab5aeaf 100644
--- a/scenenode.h
+++ b/scenenode.h
@@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/.
 #include "Classes.h"
 #include "material.h"
 #include "vertex.h"
-#include "openglgeometrybank.h"
+#include "opengl33geometrybank.h"
 
 struct lighting_data {
 
diff --git a/simulation.cpp b/simulation.cpp
index 60c839e7..b0812731 100644
--- a/simulation.cpp
+++ b/simulation.cpp
@@ -21,7 +21,7 @@ http://mozilla.org/MPL/2.0/.
 #include "AnimModel.h"
 #include "DynObj.h"
 #include "lightarray.h"
-#include "particles.h"
+#include "opengl33particles.h"
 #include "scene.h"
 #include "Train.h"
 #include "application.h"
diff --git a/simulationenvironment.h b/simulationenvironment.h
index e4370f33..9f16d91e 100644
--- a/simulationenvironment.h
+++ b/simulationenvironment.h
@@ -13,8 +13,8 @@ http://mozilla.org/MPL/2.0/.
 #include "sun.h"
 #include "moon.h"
 #include "stars.h"
-#include "skydome.h"
-#include "precipitation.h"
+#include "opengl33skydome.h"
+#include "opengl33precipitation.h"
 #include "sound.h"
 
 class opengl_renderer;
diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp
index 258746fe..f5f462a1 100644
--- a/simulationstateserializer.cpp
+++ b/simulationstateserializer.cpp
@@ -14,14 +14,14 @@ http://mozilla.org/MPL/2.0/.
 #include "simulation.h"
 #include "simulationtime.h"
 #include "scenenodegroups.h"
-#include "particles.h"
+#include "opengl33particles.h"
 #include "Event.h"
 #include "Driver.h"
 #include "DynObj.h"
 #include "AnimModel.h"
 #include "TractionPower.h"
 #include "application.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Logs.h"
 
 namespace simulation {
diff --git a/uilayer.cpp b/uilayer.cpp
index 09aa152f..232b2c29 100644
--- a/uilayer.cpp
+++ b/uilayer.cpp
@@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/.
 #include "uilayer.h"
 
 #include "Globals.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Logs.h"
 #include "Timer.h"
 #include "simulation.h"
diff --git a/vr/openvr_imp.cpp b/vr/openvr_imp.cpp
index 3fca4381..00889bfc 100644
--- a/vr/openvr_imp.cpp
+++ b/vr/openvr_imp.cpp
@@ -2,7 +2,7 @@
 #include "openvr_imp.h"
 #include "Logs.h"
 #include "Globals.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 vr_openvr::vr_openvr()
 {
diff --git a/widgets/map.h b/widgets/map.h
index 7178a591..d8f99656 100644
--- a/widgets/map.h
+++ b/widgets/map.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gl/shader.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 #include "Texture.h"
 #include "uilayer.h"
 #include "widgets/map_objects.h"
diff --git a/widgets/vehicleparams.h b/widgets/vehicleparams.h
index 732ebe32..066b1687 100644
--- a/widgets/vehicleparams.h
+++ b/widgets/vehicleparams.h
@@ -3,7 +3,7 @@
 #include "uilayer.h"
 #include "translation.h"
 #include "command.h"
-#include "renderer.h"
+#include "opengl33renderer.h"
 
 namespace ui
 {