From 2d3fb40c1628ebd32efc1e14af3b747caa051b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Mon, 16 Jun 2014 00:24:20 -0300
Subject: [PATCH] Completed refactoring Window module.

---
 include/eepp/gaming/cmap.hpp                  |   6 +-
 include/eepp/graphics/cconsole.hpp            |   2 +-
 include/eepp/graphics/cframebuffer.hpp        |   2 +-
 include/eepp/ui/cuimanager.hpp                |   4 +-
 include/eepp/ui/cuitextinput.hpp              |   2 +-
 include/eepp/window.hpp                       |  20 +-
 .../window/{cclipboard.hpp => clipboard.hpp}  |   2 +-
 .../eepp/window/{ccursor.hpp => cursor.hpp}   |   0
 .../{ccursormanager.hpp => cursormanager.hpp} |   4 +-
 .../eepp/window/{cengine.hpp => engine.hpp}   |   2 +-
 include/eepp/window/{cinput.hpp => input.hpp} |   6 +-
 .../{cinputfinger.hpp => inputfinger.hpp}     |   0
 ...nputtextbuffer.hpp => inputtextbuffer.hpp} |   4 +-
 .../window/{cjoystick.hpp => joystick.hpp}    |   0
 ...oystickmanager.hpp => joystickmanager.hpp} |   2 +-
 .../{cplatformimpl.hpp => platformimpl.hpp}   |   0
 include/eepp/window/{cview.hpp => view.hpp}   |   0
 .../eepp/window/{cwindow.hpp => window.hpp}   |   2 +-
 projects/linux/ee.creator.user                |   2 +-
 projects/linux/ee.files                       | 198 +++++++++---------
 src/eepp/graphics/cconsole.cpp                |   8 +-
 src/eepp/graphics/cframebuffer.cpp            |   4 +-
 src/eepp/graphics/cframebufferfbo.cpp         |   2 +-
 src/eepp/graphics/cparticlesystem.cpp         |   2 +-
 src/eepp/graphics/csprite.cpp                 |   2 +-
 src/eepp/graphics/ctextureloader.cpp          |   2 +-
 src/eepp/physics/cspace.cpp                   |   2 +-
 src/eepp/system/sys.cpp                       |   2 +-
 src/eepp/ui/cuidragable.cpp                   |   2 +-
 src/eepp/ui/cuimanager.cpp                    |   4 +-
 src/eepp/ui/cuitextbox.cpp                    |   2 +-
 src/eepp/ui/cuitextinput.cpp                  |   2 +-
 src/eepp/window/{cbackend.hpp => backend.hpp} |   0
 .../SDL/{cbackendsdl.cpp => backendsdl.cpp}   |   2 +-
 .../SDL/{cbackendsdl.hpp => backendsdl.hpp}   |   4 +-
 .../{cclipboardsdl.cpp => clipboardsdl.cpp}   |   4 +-
 .../{cclipboardsdl.hpp => clipboardsdl.hpp}   |   4 +-
 ...sormanagersdl.cpp => cursormanagersdl.cpp} |   6 +-
 ...sormanagersdl.hpp => cursormanagersdl.hpp} |   2 +-
 .../SDL/{ccursorsdl.cpp => cursorsdl.cpp}     |   2 +-
 .../SDL/{ccursorsdl.hpp => cursorsdl.hpp}     |   2 +-
 .../SDL/{cinputsdl.cpp => inputsdl.cpp}       |   6 +-
 .../SDL/{cinputsdl.hpp => inputsdl.hpp}       |   4 +-
 ...kmanagersdl.cpp => joystickmanagersdl.cpp} |   4 +-
 ...kmanagersdl.hpp => joystickmanagersdl.hpp} |   4 +-
 .../SDL/{cjoysticksdl.cpp => joysticksdl.cpp} |   2 +-
 .../SDL/{cjoysticksdl.hpp => joysticksdl.hpp} |   4 +-
 .../SDL/{cwindowsdl.cpp => windowsdl.cpp}     |   8 +-
 .../SDL/{cwindowsdl.hpp => windowsdl.hpp}     |   4 +-
 .../{cbackendsdl2.cpp => backendsdl2.cpp}     |   2 +-
 .../{cbackendsdl2.hpp => backendsdl2.hpp}     |   4 +-
 .../{cclipboardsdl2.cpp => clipboardsdl2.cpp} |   4 +-
 .../{cclipboardsdl2.hpp => clipboardsdl2.hpp} |   4 +-
 ...rmanagersdl2.cpp => cursormanagersdl2.cpp} |   6 +-
 ...rmanagersdl2.hpp => cursormanagersdl2.hpp} |   2 +-
 .../SDL2/{ccursorsdl2.cpp => cursorsdl2.cpp}  |   2 +-
 .../SDL2/{ccursorsdl2.hpp => cursorsdl2.hpp}  |   2 +-
 .../SDL2/{cinputsdl2.cpp => inputsdl2.cpp}    |   8 +-
 .../SDL2/{cinputsdl2.hpp => inputsdl2.hpp}    |   4 +-
 ...anagersdl2.cpp => joystickmanagersdl2.cpp} |   4 +-
 ...anagersdl2.hpp => joystickmanagersdl2.hpp} |   4 +-
 .../{cjoysticksdl2.cpp => joysticksdl2.cpp}   |   2 +-
 .../{cjoysticksdl2.hpp => joysticksdl2.hpp}   |   4 +-
 .../SDL2/{cwindowsdl2.cpp => windowsdl2.cpp}  |  10 +-
 .../SDL2/{cwindowsdl2.hpp => windowsdl2.hpp}  |   4 +-
 .../{cbackendsfml.hpp => backendsfml.hpp}     |   4 +-
 .../{cclipboardsfml.cpp => clipboardsfml.cpp} |   4 +-
 .../{cclipboardsfml.hpp => clipboardsfml.hpp} |   2 +-
 ...rmanagersfml.cpp => cursormanagersfml.cpp} |   8 +-
 ...rmanagersfml.hpp => cursormanagersfml.hpp} |   2 +-
 .../SFML/{ccursorsfml.cpp => cursorsfml.cpp}  |   2 +-
 .../SFML/{ccursorsfml.hpp => cursorsfml.hpp}  |   2 +-
 .../SFML/{cinputsfml.cpp => inputsfml.cpp}    |   6 +-
 .../SFML/{cinputsfml.hpp => inputsfml.hpp}    |   2 +-
 ...anagersfml.cpp => joystickmanagersfml.cpp} |   4 +-
 ...anagersfml.hpp => joystickmanagersfml.hpp} |   2 +-
 .../{cjoysticksfml.cpp => joysticksfml.cpp}   |   2 +-
 .../{cjoysticksfml.hpp => joysticksfml.hpp}   |   2 +-
 .../SFML/{cwindowsfml.cpp => windowsfml.cpp}  |   8 +-
 .../SFML/{cwindowsfml.hpp => windowsfml.hpp}  |   2 +-
 .../{cbackendnull.hpp => backendnull.hpp}     |   2 +-
 .../{cclipboardnull.cpp => clipboardnull.cpp} |   4 +-
 .../{cclipboardnull.hpp => clipboardnull.hpp} |   2 +-
 ...rmanagernull.cpp => cursormanagernull.cpp} |   4 +-
 ...rmanagernull.hpp => cursormanagernull.hpp} |   2 +-
 .../null/{ccursornull.cpp => cursornull.cpp}  |   2 +-
 .../null/{ccursornull.hpp => cursornull.hpp}  |   2 +-
 .../null/{cinputnull.cpp => inputnull.cpp}    |   4 +-
 .../null/{cinputnull.hpp => inputnull.hpp}    |   2 +-
 ...anagernull.cpp => joystickmanagernull.cpp} |   4 +-
 ...anagernull.hpp => joystickmanagernull.hpp} |   2 +-
 .../{cjoysticknull.cpp => joysticknull.cpp}   |   2 +-
 .../{cjoysticknull.hpp => joysticknull.hpp}   |   2 +-
 .../null/{cwindownull.cpp => windownull.cpp}  |   8 +-
 .../null/{cwindownull.hpp => windownull.hpp}  |   2 +-
 .../window/{cclipboard.cpp => clipboard.cpp}  |   2 +-
 src/eepp/window/{ccursor.cpp => cursor.cpp}   |   2 +-
 .../{ccursormanager.cpp => cursormanager.cpp} |   2 +-
 src/eepp/window/{cengine.cpp => engine.cpp}   |  10 +-
 src/eepp/window/{cinput.cpp => input.cpp}     |   4 +-
 .../{cinputfinger.cpp => inputfinger.cpp}     |   2 +-
 ...nputtextbuffer.cpp => inputtextbuffer.cpp} |   6 +-
 .../window/{cjoystick.cpp => joystick.cpp}    |   4 +-
 ...oystickmanager.cpp => joystickmanager.cpp} |   2 +-
 .../null/{cnullimpl.cpp => nullimpl.cpp}      |   2 +-
 .../null/{cnullimpl.hpp => nullimpl.hpp}      |   2 +-
 .../osx/{cosximpl.cpp => osximpl.cpp}         |   2 +-
 .../osx/{cosximpl.hpp => osximpl.hpp}         |   2 +-
 src/eepp/window/platform/platformimpl.hpp     |   8 +-
 .../win/{ccursorwin.cpp => cursorwin.cpp}     |   6 +-
 .../win/{ccursorwin.hpp => cursorwin.hpp}     |   2 +-
 .../win/{cwinimpl.cpp => winimpl.cpp}         |   6 +-
 .../win/{cwinimpl.hpp => winimpl.hpp}         |   2 +-
 .../x11/{ccursorx11.cpp => cursorx11.cpp}     |   6 +-
 .../x11/{ccursorx11.hpp => cursorx11.hpp}     |   2 +-
 .../x11/{cx11impl.cpp => x11impl.cpp}         |   4 +-
 .../x11/{cx11impl.hpp => x11impl.hpp}         |   2 +-
 .../{cplatformimpl.cpp => platformimpl.cpp}   |   4 +-
 src/eepp/window/{cview.cpp => view.cpp}       |   2 +-
 src/eepp/window/{cwindow.cpp => window.cpp}   |  14 +-
 120 files changed, 308 insertions(+), 308 deletions(-)
 rename include/eepp/window/{cclipboard.hpp => clipboard.hpp} (96%)
 rename include/eepp/window/{ccursor.hpp => cursor.hpp} (100%)
 rename include/eepp/window/{ccursormanager.hpp => cursormanager.hpp} (98%)
 rename include/eepp/window/{cengine.hpp => engine.hpp} (99%)
 rename include/eepp/window/{cinput.hpp => input.hpp} (98%)
 rename include/eepp/window/{cinputfinger.hpp => inputfinger.hpp} (100%)
 rename include/eepp/window/{cinputtextbuffer.hpp => inputtextbuffer.hpp} (98%)
 rename include/eepp/window/{cjoystick.hpp => joystick.hpp} (100%)
 rename include/eepp/window/{cjoystickmanager.hpp => joystickmanager.hpp} (96%)
 rename include/eepp/window/{cplatformimpl.hpp => platformimpl.hpp} (100%)
 rename include/eepp/window/{cview.hpp => view.hpp} (100%)
 rename include/eepp/window/{cwindow.hpp => window.hpp} (99%)
 rename src/eepp/window/{cbackend.hpp => backend.hpp} (100%)
 rename src/eepp/window/backend/SDL/{cbackendsdl.cpp => backendsdl.cpp} (83%)
 rename src/eepp/window/backend/SDL/{cbackendsdl.hpp => backendsdl.hpp} (80%)
 rename src/eepp/window/backend/SDL/{cclipboardsdl.cpp => clipboardsdl.cpp} (98%)
 rename src/eepp/window/backend/SDL/{cclipboardsdl.hpp => clipboardsdl.hpp} (94%)
 rename src/eepp/window/backend/SDL/{ccursormanagersdl.cpp => cursormanagersdl.cpp} (93%)
 rename src/eepp/window/backend/SDL/{ccursormanagersdl.hpp => cursormanagersdl.hpp} (95%)
 rename src/eepp/window/backend/SDL/{ccursorsdl.cpp => cursorsdl.cpp} (92%)
 rename src/eepp/window/backend/SDL/{ccursorsdl.hpp => cursorsdl.hpp} (95%)
 rename src/eepp/window/backend/SDL/{cinputsdl.cpp => inputsdl.cpp} (97%)
 rename src/eepp/window/backend/SDL/{cinputsdl.hpp => inputsdl.hpp} (88%)
 rename src/eepp/window/backend/SDL/{cjoystickmanagersdl.cpp => joystickmanagersdl.cpp} (90%)
 rename src/eepp/window/backend/SDL/{cjoystickmanagersdl.hpp => joystickmanagersdl.hpp} (85%)
 rename src/eepp/window/backend/SDL/{cjoysticksdl.cpp => joysticksdl.cpp} (96%)
 rename src/eepp/window/backend/SDL/{cjoysticksdl.hpp => joysticksdl.hpp} (90%)
 rename src/eepp/window/backend/SDL/{cwindowsdl.cpp => windowsdl.cpp} (98%)
 rename src/eepp/window/backend/SDL/{cwindowsdl.hpp => windowsdl.hpp} (94%)
 rename src/eepp/window/backend/SDL2/{cbackendsdl2.cpp => backendsdl2.cpp} (89%)
 rename src/eepp/window/backend/SDL2/{cbackendsdl2.hpp => backendsdl2.hpp} (80%)
 rename src/eepp/window/backend/SDL2/{cclipboardsdl2.cpp => clipboardsdl2.cpp} (85%)
 rename src/eepp/window/backend/SDL2/{cclipboardsdl2.hpp => clipboardsdl2.hpp} (88%)
 rename src/eepp/window/backend/SDL2/{ccursormanagersdl2.cpp => cursormanagersdl2.cpp} (93%)
 rename src/eepp/window/backend/SDL2/{ccursormanagersdl2.hpp => cursormanagersdl2.hpp} (95%)
 rename src/eepp/window/backend/SDL2/{ccursorsdl2.cpp => cursorsdl2.cpp} (97%)
 rename src/eepp/window/backend/SDL2/{ccursorsdl2.hpp => cursorsdl2.hpp} (95%)
 rename src/eepp/window/backend/SDL2/{cinputsdl2.cpp => inputsdl2.cpp} (98%)
 rename src/eepp/window/backend/SDL2/{cinputsdl2.hpp => inputsdl2.hpp} (89%)
 rename src/eepp/window/backend/SDL2/{cjoystickmanagersdl2.cpp => joystickmanagersdl2.cpp} (89%)
 rename src/eepp/window/backend/SDL2/{cjoystickmanagersdl2.hpp => joystickmanagersdl2.hpp} (85%)
 rename src/eepp/window/backend/SDL2/{cjoysticksdl2.cpp => joysticksdl2.cpp} (97%)
 rename src/eepp/window/backend/SDL2/{cjoysticksdl2.hpp => joysticksdl2.hpp} (89%)
 rename src/eepp/window/backend/SDL2/{cwindowsdl2.cpp => windowsdl2.cpp} (98%)
 rename src/eepp/window/backend/SDL2/{cwindowsdl2.hpp => windowsdl2.hpp} (97%)
 rename src/eepp/window/backend/SFML/{cbackendsfml.hpp => backendsfml.hpp} (80%)
 rename src/eepp/window/backend/SFML/{cclipboardsfml.cpp => clipboardsfml.cpp} (81%)
 rename src/eepp/window/backend/SFML/{cclipboardsfml.hpp => clipboardsfml.hpp} (93%)
 rename src/eepp/window/backend/SFML/{ccursormanagersfml.cpp => cursormanagersfml.cpp} (91%)
 rename src/eepp/window/backend/SFML/{ccursormanagersfml.hpp => cursormanagersfml.hpp} (95%)
 rename src/eepp/window/backend/SFML/{ccursorsfml.cpp => cursorsfml.cpp} (92%)
 rename src/eepp/window/backend/SFML/{ccursorsfml.hpp => cursorsfml.hpp} (95%)
 rename src/eepp/window/backend/SFML/{cinputsfml.cpp => inputsfml.cpp} (98%)
 rename src/eepp/window/backend/SFML/{cinputsfml.hpp => inputsfml.hpp} (95%)
 rename src/eepp/window/backend/SFML/{cjoystickmanagersfml.cpp => joystickmanagersfml.cpp} (86%)
 rename src/eepp/window/backend/SFML/{cjoystickmanagersfml.hpp => joystickmanagersfml.hpp} (91%)
 rename src/eepp/window/backend/SFML/{cjoysticksfml.cpp => joysticksfml.cpp} (97%)
 rename src/eepp/window/backend/SFML/{cjoysticksfml.hpp => joysticksfml.hpp} (93%)
 rename src/eepp/window/backend/SFML/{cwindowsfml.cpp => windowsfml.cpp} (96%)
 rename src/eepp/window/backend/SFML/{cwindowsfml.hpp => windowsfml.hpp} (97%)
 rename src/eepp/window/backend/null/{cbackendnull.hpp => backendnull.hpp} (89%)
 rename src/eepp/window/backend/null/{cclipboardnull.cpp => clipboardnull.cpp} (79%)
 rename src/eepp/window/backend/null/{cclipboardnull.hpp => clipboardnull.hpp} (92%)
 rename src/eepp/window/backend/null/{ccursormanagernull.cpp => cursormanagernull.cpp} (90%)
 rename src/eepp/window/backend/null/{ccursormanagernull.hpp => cursormanagernull.hpp} (94%)
 rename src/eepp/window/backend/null/{ccursornull.cpp => cursornull.cpp} (92%)
 rename src/eepp/window/backend/null/{ccursornull.hpp => cursornull.hpp} (94%)
 rename src/eepp/window/backend/null/{cinputnull.cpp => inputnull.cpp} (79%)
 rename src/eepp/window/backend/null/{cinputnull.hpp => inputnull.hpp} (93%)
 rename src/eepp/window/backend/null/{cjoystickmanagernull.cpp => joystickmanagernull.cpp} (76%)
 rename src/eepp/window/backend/null/{cjoystickmanagernull.hpp => joystickmanagernull.hpp} (90%)
 rename src/eepp/window/backend/null/{cjoysticknull.cpp => joysticknull.cpp} (91%)
 rename src/eepp/window/backend/null/{cjoysticknull.hpp => joysticknull.hpp} (93%)
 rename src/eepp/window/backend/null/{cwindownull.cpp => windownull.cpp} (87%)
 rename src/eepp/window/backend/null/{cwindownull.hpp => windownull.hpp} (96%)
 rename src/eepp/window/{cclipboard.cpp => clipboard.cpp} (85%)
 rename src/eepp/window/{ccursor.cpp => cursor.cpp} (97%)
 rename src/eepp/window/{ccursormanager.cpp => cursormanager.cpp} (98%)
 rename src/eepp/window/{cengine.cpp => engine.cpp} (97%)
 rename src/eepp/window/{cinput.cpp => input.cpp} (99%)
 rename src/eepp/window/{cinputfinger.cpp => inputfinger.cpp} (91%)
 rename src/eepp/window/{cinputtextbuffer.cpp => inputtextbuffer.cpp} (99%)
 rename src/eepp/window/{cjoystick.cpp => joystick.cpp} (94%)
 rename src/eepp/window/{cjoystickmanager.cpp => joystickmanager.cpp} (93%)
 rename src/eepp/window/platform/null/{cnullimpl.cpp => nullimpl.cpp} (96%)
 rename src/eepp/window/platform/null/{cnullimpl.hpp => nullimpl.hpp} (96%)
 rename src/eepp/window/platform/osx/{cosximpl.cpp => osximpl.cpp} (96%)
 rename src/eepp/window/platform/osx/{cosximpl.hpp => osximpl.hpp} (96%)
 rename src/eepp/window/platform/win/{ccursorwin.cpp => cursorwin.cpp} (97%)
 rename src/eepp/window/platform/win/{ccursorwin.hpp => cursorwin.hpp} (95%)
 rename src/eepp/window/platform/win/{cwinimpl.cpp => winimpl.cpp} (97%)
 rename src/eepp/window/platform/win/{cwinimpl.hpp => winimpl.hpp} (96%)
 rename src/eepp/window/platform/x11/{ccursorx11.cpp => cursorx11.cpp} (93%)
 rename src/eepp/window/platform/x11/{ccursorx11.hpp => cursorx11.hpp} (95%)
 rename src/eepp/window/platform/x11/{cx11impl.cpp => x11impl.cpp} (98%)
 rename src/eepp/window/platform/x11/{cx11impl.hpp => x11impl.hpp} (97%)
 rename src/eepp/window/{cplatformimpl.cpp => platformimpl.cpp} (70%)
 rename src/eepp/window/{cview.cpp => view.cpp} (98%)
 rename src/eepp/window/{cwindow.cpp => window.cpp} (97%)

diff --git a/include/eepp/gaming/cmap.hpp b/include/eepp/gaming/cmap.hpp
index 0ea5a78a0..4565bc807 100644
--- a/include/eepp/gaming/cmap.hpp
+++ b/include/eepp/gaming/cmap.hpp
@@ -9,9 +9,9 @@
 #include <eepp/gaming/clightmanager.hpp>
 #include <eepp/gaming/clayer.hpp>
 
-#include <eepp/window/cinput.hpp>
-#include <eepp/window/cengine.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/input.hpp>
+#include <eepp/window/engine.hpp>
+#include <eepp/window/window.hpp>
 using namespace EE::Window;
 
 #include <eepp/graphics/ctexture.hpp>
diff --git a/include/eepp/graphics/cconsole.hpp b/include/eepp/graphics/cconsole.hpp
index 390c0d77f..321604088 100755
--- a/include/eepp/graphics/cconsole.hpp
+++ b/include/eepp/graphics/cconsole.hpp
@@ -2,7 +2,7 @@
 #define EE_GRAPHICSCCONSOLE_H
 
 #include <eepp/graphics/base.hpp>
-#include <eepp/window/cinputtextbuffer.hpp>
+#include <eepp/window/inputtextbuffer.hpp>
 #include <eepp/graphics/cprimitives.hpp>
 #include <eepp/graphics/cfont.hpp>
 #include <deque>
diff --git a/include/eepp/graphics/cframebuffer.hpp b/include/eepp/graphics/cframebuffer.hpp
index c128a94e2..fedf0dc5d 100644
--- a/include/eepp/graphics/cframebuffer.hpp
+++ b/include/eepp/graphics/cframebuffer.hpp
@@ -3,7 +3,7 @@
 
 #include <eepp/graphics/base.hpp>
 #include <eepp/graphics/ctexture.hpp>
-#include <eepp/window/cview.hpp>
+#include <eepp/window/view.hpp>
 
 namespace EE { namespace Window { class Window; } }
 
diff --git a/include/eepp/ui/cuimanager.hpp b/include/eepp/ui/cuimanager.hpp
index 72f7f5548..8322fc8bd 100644
--- a/include/eepp/ui/cuimanager.hpp
+++ b/include/eepp/ui/cuimanager.hpp
@@ -3,8 +3,8 @@
 
 #include <eepp/ui/cuicontrol.hpp>
 #include <eepp/ui/cuiwindow.hpp>
-#include <eepp/window/cinput.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/input.hpp>
+#include <eepp/window/window.hpp>
 #include <eepp/window/cursorhelper.hpp>
 
 namespace EE { namespace UI {
diff --git a/include/eepp/ui/cuitextinput.hpp b/include/eepp/ui/cuitextinput.hpp
index d27addc88..e6888525d 100644
--- a/include/eepp/ui/cuitextinput.hpp
+++ b/include/eepp/ui/cuitextinput.hpp
@@ -3,7 +3,7 @@
 
 #include <eepp/ui/cuicontrolanim.hpp>
 #include <eepp/ui/cuitextbox.hpp>
-#include <eepp/window/cinputtextbuffer.hpp>
+#include <eepp/window/inputtextbuffer.hpp>
 
 namespace EE { namespace UI {
 
diff --git a/include/eepp/window.hpp b/include/eepp/window.hpp
index 990b6dae3..31e8f9544 100644
--- a/include/eepp/window.hpp
+++ b/include/eepp/window.hpp
@@ -3,15 +3,15 @@
 
 #include <eepp/window/windowhandle.hpp>
 #include <eepp/window/windowcontext.hpp>
-#include <eepp/window/cinput.hpp>
-#include <eepp/window/cinputtextbuffer.hpp>
-#include <eepp/window/cview.hpp>
-#include <eepp/window/cwindow.hpp>
-#include <eepp/window/cclipboard.hpp>
-#include <eepp/window/ccursor.hpp>
-#include <eepp/window/ccursormanager.hpp>
-#include <eepp/window/cjoystick.hpp>
-#include <eepp/window/cjoystickmanager.hpp>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/input.hpp>
+#include <eepp/window/inputtextbuffer.hpp>
+#include <eepp/window/view.hpp>
+#include <eepp/window/window.hpp>
+#include <eepp/window/clipboard.hpp>
+#include <eepp/window/cursor.hpp>
+#include <eepp/window/cursormanager.hpp>
+#include <eepp/window/joystick.hpp>
+#include <eepp/window/joystickmanager.hpp>
+#include <eepp/window/engine.hpp>
 
 #endif
diff --git a/include/eepp/window/cclipboard.hpp b/include/eepp/window/clipboard.hpp
similarity index 96%
rename from include/eepp/window/cclipboard.hpp
rename to include/eepp/window/clipboard.hpp
index 6f9ebd200..edb9d8856 100644
--- a/include/eepp/window/cclipboard.hpp
+++ b/include/eepp/window/clipboard.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCCLIPBOARD_HPP
 #define EE_WINDOWCCLIPBOARD_HPP
 
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/window.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/include/eepp/window/ccursor.hpp b/include/eepp/window/cursor.hpp
similarity index 100%
rename from include/eepp/window/ccursor.hpp
rename to include/eepp/window/cursor.hpp
diff --git a/include/eepp/window/ccursormanager.hpp b/include/eepp/window/cursormanager.hpp
similarity index 98%
rename from include/eepp/window/ccursormanager.hpp
rename to include/eepp/window/cursormanager.hpp
index 85327955e..189f186c7 100644
--- a/include/eepp/window/ccursormanager.hpp
+++ b/include/eepp/window/cursormanager.hpp
@@ -7,9 +7,9 @@
 #include <eepp/graphics/ctexture.hpp>
 using namespace EE::Graphics;
 
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/window.hpp>
 #include <eepp/window/cursorhelper.hpp>
-#include <eepp/window/ccursor.hpp>
+#include <eepp/window/cursor.hpp>
 
 #include <set>
 
diff --git a/include/eepp/window/cengine.hpp b/include/eepp/window/engine.hpp
similarity index 99%
rename from include/eepp/window/cengine.hpp
rename to include/eepp/window/engine.hpp
index 59877d058..2f3d66708 100755
--- a/include/eepp/window/cengine.hpp
+++ b/include/eepp/window/engine.hpp
@@ -2,7 +2,7 @@
 #define EE_WINDOWCENGINE_H
 
 #include <eepp/window/base.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/window.hpp>
 #include <list>
 
 namespace EE { namespace System { class IniFile; } }
diff --git a/include/eepp/window/cinput.hpp b/include/eepp/window/input.hpp
similarity index 98%
rename from include/eepp/window/cinput.hpp
rename to include/eepp/window/input.hpp
index 99e2bac8f..379b5518c 100644
--- a/include/eepp/window/cinput.hpp
+++ b/include/eepp/window/input.hpp
@@ -2,11 +2,11 @@
 #define EE_WINDOWCINPUT_H
 
 #include <eepp/window/base.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/window.hpp>
 #include <eepp/window/inputhelper.hpp>
 #include <eepp/window/inputevent.hpp>
-#include <eepp/window/cjoystickmanager.hpp>
-#include <eepp/window/cinputfinger.hpp>
+#include <eepp/window/joystickmanager.hpp>
+#include <eepp/window/inputfinger.hpp>
 #include <list>
 
 namespace EE { namespace Window {
diff --git a/include/eepp/window/cinputfinger.hpp b/include/eepp/window/inputfinger.hpp
similarity index 100%
rename from include/eepp/window/cinputfinger.hpp
rename to include/eepp/window/inputfinger.hpp
diff --git a/include/eepp/window/cinputtextbuffer.hpp b/include/eepp/window/inputtextbuffer.hpp
similarity index 98%
rename from include/eepp/window/cinputtextbuffer.hpp
rename to include/eepp/window/inputtextbuffer.hpp
index 8859918cf..2ad276395 100755
--- a/include/eepp/window/cinputtextbuffer.hpp
+++ b/include/eepp/window/inputtextbuffer.hpp
@@ -2,8 +2,8 @@
 #define EE_WINDOWCINPUTTEXTBUFFER_H
 
 #include <eepp/window/base.hpp>
-#include <eepp/window/cinput.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/input.hpp>
+#include <eepp/window/window.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/include/eepp/window/cjoystick.hpp b/include/eepp/window/joystick.hpp
similarity index 100%
rename from include/eepp/window/cjoystick.hpp
rename to include/eepp/window/joystick.hpp
diff --git a/include/eepp/window/cjoystickmanager.hpp b/include/eepp/window/joystickmanager.hpp
similarity index 96%
rename from include/eepp/window/cjoystickmanager.hpp
rename to include/eepp/window/joystickmanager.hpp
index 27aa7607a..4b6452774 100644
--- a/include/eepp/window/cjoystickmanager.hpp
+++ b/include/eepp/window/joystickmanager.hpp
@@ -2,7 +2,7 @@
 #define EE_WINDOWCJOYSTICKMANAGER_HPP
 
 #include <eepp/window/base.hpp>
-#include <eepp/window/cjoystick.hpp>
+#include <eepp/window/joystick.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/include/eepp/window/cplatformimpl.hpp b/include/eepp/window/platformimpl.hpp
similarity index 100%
rename from include/eepp/window/cplatformimpl.hpp
rename to include/eepp/window/platformimpl.hpp
diff --git a/include/eepp/window/cview.hpp b/include/eepp/window/view.hpp
similarity index 100%
rename from include/eepp/window/cview.hpp
rename to include/eepp/window/view.hpp
diff --git a/include/eepp/window/cwindow.hpp b/include/eepp/window/window.hpp
similarity index 99%
rename from include/eepp/window/cwindow.hpp
rename to include/eepp/window/window.hpp
index a220455d3..0cbee5e2c 100644
--- a/include/eepp/window/cwindow.hpp
+++ b/include/eepp/window/window.hpp
@@ -2,7 +2,7 @@
 #define EE_WINDOWCWINDOW_HPP
 
 #include <eepp/window/base.hpp>
-#include <eepp/window/cview.hpp>
+#include <eepp/window/view.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user
index 0b766a0e4..29e4137c0 100644
--- a/projects/linux/ee.creator.user
+++ b/projects/linux/ee.creator.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.0, 2014-06-16T00:04:43. -->
+<!-- Written by QtCreator 3.0.0, 2014-06-16T00:24:04. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/projects/linux/ee.files b/projects/linux/ee.files
index ab06144ba..f46bdf821 100644
--- a/projects/linux/ee.files
+++ b/projects/linux/ee.files
@@ -346,65 +346,65 @@
 ../../include/eepp/window/joycodes.hpp
 ../../include/eepp/window/inputhelper.hpp
 ../../include/eepp/window/inputevent.hpp
-../../include/eepp/window/cwindow.hpp
-../../include/eepp/window/cview.hpp
+../../include/eepp/window/window.hpp
+../../include/eepp/window/view.hpp
 ../../include/eepp/window/cursorhelper.hpp
-../../include/eepp/window/cplatformimpl.hpp
-../../include/eepp/window/cjoystickmanager.hpp
-../../include/eepp/window/cjoystick.hpp
-../../include/eepp/window/cinputtextbuffer.hpp
-../../include/eepp/window/cinputfinger.hpp
-../../include/eepp/window/cinput.hpp
-../../include/eepp/window/cengine.hpp
-../../include/eepp/window/ccursormanager.hpp
-../../include/eepp/window/ccursor.hpp
-../../include/eepp/window/cclipboard.hpp
+../../include/eepp/window/platformimpl.hpp
+../../include/eepp/window/joystickmanager.hpp
+../../include/eepp/window/joystick.hpp
+../../include/eepp/window/inputtextbuffer.hpp
+../../include/eepp/window/inputfinger.hpp
+../../include/eepp/window/input.hpp
+../../include/eepp/window/engine.hpp
+../../include/eepp/window/cursormanager.hpp
+../../include/eepp/window/cursor.hpp
+../../include/eepp/window/clipboard.hpp
 ../../include/eepp/window/base.hpp
 ../../src/eepp/window/inputhelper.cpp
-../../src/eepp/window/cwindow.cpp
-../../src/eepp/window/cview.cpp
-../../src/eepp/window/cplatformimpl.cpp
-../../src/eepp/window/cjoystickmanager.cpp
-../../src/eepp/window/cjoystick.cpp
-../../src/eepp/window/cinputtextbuffer.cpp
-../../src/eepp/window/cinputfinger.cpp
-../../src/eepp/window/cinput.cpp
-../../src/eepp/window/cengine.cpp
-../../src/eepp/window/ccursormanager.cpp
-../../src/eepp/window/ccursor.cpp
-../../src/eepp/window/cclipboard.cpp
-../../src/eepp/window/backend/SDL/cwindowsdl.hpp
-../../src/eepp/window/backend/SDL/cjoysticksdl.hpp
-../../src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp
-../../src/eepp/window/backend/SDL/cinputsdl.hpp
-../../src/eepp/window/backend/SDL/ccursorsdl.hpp
-../../src/eepp/window/backend/SDL/ccursormanagersdl.hpp
-../../src/eepp/window/backend/SDL/cclipboardsdl.hpp
-../../src/eepp/window/backend/SDL/cbackendsdl.hpp
+../../src/eepp/window/window.cpp
+../../src/eepp/window/view.cpp
+../../src/eepp/window/platformimpl.cpp
+../../src/eepp/window/joystickmanager.cpp
+../../src/eepp/window/joystick.cpp
+../../src/eepp/window/inputtextbuffer.cpp
+../../src/eepp/window/inputfinger.cpp
+../../src/eepp/window/input.cpp
+../../src/eepp/window/engine.cpp
+../../src/eepp/window/cursormanager.cpp
+../../src/eepp/window/cursor.cpp
+../../src/eepp/window/clipboard.cpp
+../../src/eepp/window/backend/SDL/windowsdl.hpp
+../../src/eepp/window/backend/SDL/joysticksdl.hpp
+../../src/eepp/window/backend/SDL/joystickmanagersdl.hpp
+../../src/eepp/window/backend/SDL/inputsdl.hpp
+../../src/eepp/window/backend/SDL/cursorsdl.hpp
+../../src/eepp/window/backend/SDL/cursormanagersdl.hpp
+../../src/eepp/window/backend/SDL/clipboardsdl.hpp
+../../src/eepp/window/backend/SDL/backendsdl.hpp
 ../../src/eepp/window/backend/SDL/base.hpp
-../../src/eepp/window/backend/SDL/cwindowsdl.cpp
-../../src/eepp/window/backend/SDL/cjoysticksdl.cpp
-../../src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp
-../../src/eepp/window/backend/SDL/cinputsdl.cpp
-../../src/eepp/window/backend/SDL/ccursorsdl.cpp
-../../src/eepp/window/backend/SDL/ccursormanagersdl.cpp
-../../src/eepp/window/backend/SDL/cclipboardsdl.cpp
-../../src/eepp/window/backend/SDL2/cwindowsdl2.hpp
-../../src/eepp/window/backend/SDL2/cjoysticksdl2.hpp
-../../src/eepp/window/backend/SDL2/cjoystickmanagersdl2.hpp
-../../src/eepp/window/backend/SDL2/cinputsdl2.hpp
-../../src/eepp/window/backend/SDL2/ccursorsdl2.hpp
-../../src/eepp/window/backend/SDL2/ccursormanagersdl2.hpp
-../../src/eepp/window/backend/SDL2/cclipboardsdl2.hpp
-../../src/eepp/window/backend/SDL2/cbackendsdl2.hpp
+../../src/eepp/window/backend/SDL/windowsdl.cpp
+../../src/eepp/window/backend/SDL/joysticksdl.cpp
+../../src/eepp/window/backend/SDL/joystickmanagersdl.cpp
+../../src/eepp/window/backend/SDL/inputsdl.cpp
+../../src/eepp/window/backend/SDL/cursorsdl.cpp
+../../src/eepp/window/backend/SDL/cursormanagersdl.cpp
+../../src/eepp/window/backend/SDL/clipboardsdl.cpp
+../../src/eepp/window/backend/SDL2/windowsdl2.hpp
+../../src/eepp/window/backend/SDL2/joysticksdl2.hpp
+../../src/eepp/window/backend/SDL2/joystickmanagersdl2.hpp
+../../src/eepp/window/backend/SDL2/inputsdl2.hpp
+../../src/eepp/window/backend/SDL2/cursorsdl2.hpp
+../../src/eepp/window/backend/SDL2/cursormanagersdl2.hpp
+../../src/eepp/window/backend/SDL2/clipboardsdl2.hpp
+../../src/eepp/window/backend/SDL2/backendsdl2.hpp
 ../../src/eepp/window/backend/SDL2/base.hpp
-../../src/eepp/window/backend/SDL2/cwindowsdl2.cpp
-../../src/eepp/window/backend/SDL2/cjoysticksdl2.cpp
-../../src/eepp/window/backend/SDL2/cjoystickmanagersdl2.cpp
-../../src/eepp/window/backend/SDL2/cinputsdl2.cpp
-../../src/eepp/window/backend/SDL2/ccursorsdl2.cpp
-../../src/eepp/window/backend/SDL2/ccursormanagersdl2.cpp
-../../src/eepp/window/backend/SDL2/cclipboardsdl2.cpp
+../../src/eepp/window/backend/SDL2/windowsdl2.cpp
+../../src/eepp/window/backend/SDL2/joysticksdl2.cpp
+../../src/eepp/window/backend/SDL2/joystickmanagersdl2.cpp
+../../src/eepp/window/backend/SDL2/inputsdl2.cpp
+../../src/eepp/window/backend/SDL2/cursorsdl2.cpp
+../../src/eepp/window/backend/SDL2/cursormanagersdl2.cpp
+../../src/eepp/window/backend/SDL2/clipboardsdl2.cpp
 ../../src/eepp/window/backend/allegro5/cwindowal.hpp
 ../../src/eepp/window/backend/allegro5/cjoystickmanageral.hpp
 ../../src/eepp/window/backend/allegro5/cjoystickal.hpp
@@ -420,33 +420,33 @@
 ../../src/eepp/window/backend/allegro5/ccursormanageral.cpp
 ../../src/eepp/window/backend/allegro5/ccursoral.cpp
 ../../src/eepp/window/backend/allegro5/cclipboardal.cpp
-../../src/eepp/window/backend/null/cwindownull.hpp
-../../src/eepp/window/backend/null/cjoysticknull.hpp
-../../src/eepp/window/backend/null/cjoystickmanagernull.hpp
-../../src/eepp/window/backend/null/cinputnull.hpp
-../../src/eepp/window/backend/null/ccursornull.hpp
-../../src/eepp/window/backend/null/ccursormanagernull.hpp
-../../src/eepp/window/backend/null/cclipboardnull.hpp
-../../src/eepp/window/backend/null/cbackendnull.hpp
-../../src/eepp/window/backend/null/cwindownull.cpp
-../../src/eepp/window/backend/null/cjoysticknull.cpp
-../../src/eepp/window/backend/null/cjoystickmanagernull.cpp
-../../src/eepp/window/backend/null/cinputnull.cpp
-../../src/eepp/window/backend/null/ccursornull.cpp
-../../src/eepp/window/backend/null/ccursormanagernull.cpp
-../../src/eepp/window/backend/null/cclipboardnull.cpp
-../../src/eepp/window/platform/null/cnullimpl.hpp
-../../src/eepp/window/platform/null/cnullimpl.cpp
-../../src/eepp/window/platform/osx/cosximpl.hpp
-../../src/eepp/window/platform/osx/cosximpl.cpp
-../../src/eepp/window/platform/win/cwinimpl.hpp
-../../src/eepp/window/platform/win/ccursorwin.hpp
-../../src/eepp/window/platform/win/cwinimpl.cpp
-../../src/eepp/window/platform/win/ccursorwin.cpp
-../../src/eepp/window/platform/x11/cx11impl.hpp
-../../src/eepp/window/platform/x11/ccursorx11.hpp
-../../src/eepp/window/platform/x11/cx11impl.cpp
-../../src/eepp/window/platform/x11/ccursorx11.cpp
+../../src/eepp/window/backend/null/windownull.hpp
+../../src/eepp/window/backend/null/joysticknull.hpp
+../../src/eepp/window/backend/null/joystickmanagernull.hpp
+../../src/eepp/window/backend/null/inputnull.hpp
+../../src/eepp/window/backend/null/cursornull.hpp
+../../src/eepp/window/backend/null/cursormanagernull.hpp
+../../src/eepp/window/backend/null/clipboardnull.hpp
+../../src/eepp/window/backend/null/backendnull.hpp
+../../src/eepp/window/backend/null/windownull.cpp
+../../src/eepp/window/backend/null/joysticknull.cpp
+../../src/eepp/window/backend/null/joystickmanagernull.cpp
+../../src/eepp/window/backend/null/inputnull.cpp
+../../src/eepp/window/backend/null/cursornull.cpp
+../../src/eepp/window/backend/null/cursormanagernull.cpp
+../../src/eepp/window/backend/null/clipboardnull.cpp
+../../src/eepp/window/platform/null/nullimpl.hpp
+../../src/eepp/window/platform/null/nullimpl.cpp
+../../src/eepp/window/platform/osx/osximpl.hpp
+../../src/eepp/window/platform/osx/osximpl.cpp
+../../src/eepp/window/platform/win/winimpl.hpp
+../../src/eepp/window/platform/win/cursorwin.hpp
+../../src/eepp/window/platform/win/winimpl.cpp
+../../src/eepp/window/platform/win/cursorwin.cpp
+../../src/eepp/window/platform/x11/x11impl.hpp
+../../src/eepp/window/platform/x11/cursorx11.hpp
+../../src/eepp/window/platform/x11/x11impl.cpp
+../../src/eepp/window/platform/x11/cursorx11.cpp
 ../../src/eepp/window/platform/platformimpl.hpp
 ../../src/eepp/graphics/pixelperfect.cpp
 ../../src/eepp/graphics/cvertexbuffervbo.cpp
@@ -530,22 +530,22 @@
 ../../include/eepp/config.hpp
 ../../include/eepp/core.hpp
 ../../include/eepp/audio.hpp
-../../src/eepp/window/backend/SFML/cwindowsfml.hpp
-../../src/eepp/window/backend/SFML/cjoysticksfml.hpp
-../../src/eepp/window/backend/SFML/cjoystickmanagersfml.hpp
-../../src/eepp/window/backend/SFML/cinputsfml.hpp
-../../src/eepp/window/backend/SFML/ccursorsfml.hpp
-../../src/eepp/window/backend/SFML/ccursormanagersfml.hpp
-../../src/eepp/window/backend/SFML/cclipboardsfml.hpp
-../../src/eepp/window/backend/SFML/cbackendsfml.hpp
-../../src/eepp/window/backend/SFML/cwindowsfml.cpp
-../../src/eepp/window/backend/SFML/cjoysticksfml.cpp
-../../src/eepp/window/backend/SFML/cjoystickmanagersfml.cpp
-../../src/eepp/window/backend/SFML/cinputsfml.cpp
-../../src/eepp/window/backend/SFML/ccursorsfml.cpp
-../../src/eepp/window/backend/SFML/ccursormanagersfml.cpp
-../../src/eepp/window/backend/SFML/cclipboardsfml.cpp
-../../src/eepp/window/cbackend.hpp
+../../src/eepp/window/backend/SFML/windowsfml.hpp
+../../src/eepp/window/backend/SFML/joysticksfml.hpp
+../../src/eepp/window/backend/SFML/joystickmanagersfml.hpp
+../../src/eepp/window/backend/SFML/inputsfml.hpp
+../../src/eepp/window/backend/SFML/cursorsfml.hpp
+../../src/eepp/window/backend/SFML/cursormanagersfml.hpp
+../../src/eepp/window/backend/SFML/clipboardsfml.hpp
+../../src/eepp/window/backend/SFML/backendsfml.hpp
+../../src/eepp/window/backend/SFML/windowsfml.cpp
+../../src/eepp/window/backend/SFML/joysticksfml.cpp
+../../src/eepp/window/backend/SFML/joystickmanagersfml.cpp
+../../src/eepp/window/backend/SFML/inputsfml.cpp
+../../src/eepp/window/backend/SFML/cursorsfml.cpp
+../../src/eepp/window/backend/SFML/cursormanagersfml.cpp
+../../src/eepp/window/backend/SFML/clipboardsfml.cpp
+../../src/eepp/window/backend.hpp
 ../../src/eepp/graphics/cframebufferfbo.hpp
 ../../src/eepp/graphics/renderer/rendererhelper.hpp
 ../../include/eepp/graphics/packerhelper.hpp
@@ -598,7 +598,7 @@
 ../../src/eepp/helper/SOIL2/src/SOIL2/stbi_ext.h
 ../../src/eepp/audio/soundfile.hpp
 ../../src/eepp/audio/openal.hpp
-../../src/eepp/window/backend/SDL2/cbackendsdl2.cpp
+../../src/eepp/window/backend/SDL2/backendsdl2.cpp
 ../../src/examples/sound/sound.cpp
 ../../src/examples/sprites/sprites.cpp
 ../../src/examples/fonts/fonts.cpp
@@ -661,7 +661,7 @@
 ../../include/eepp/graphics/renderer/crenderergl3cp.hpp
 ../../src/eepp/graphics/renderer/shaders/basegl3cp.vert
 ../../src/eepp/graphics/renderer/shaders/basegl3cp.frag
-../../src/eepp/window/backend/SDL/cbackendsdl.cpp
+../../src/eepp/window/backend/SDL/backendsdl.cpp
 ../../bin/assets/ee.ini
 ../../src/eepp/network/ssl/sslsocket.cpp
 ../../src/eepp/network/ssl/sslsocketimpl.hpp
diff --git a/src/eepp/graphics/cconsole.cpp b/src/eepp/graphics/cconsole.cpp
index b8a5776af..ae12d1cf0 100755
--- a/src/eepp/graphics/cconsole.cpp
+++ b/src/eepp/graphics/cconsole.cpp
@@ -1,10 +1,10 @@
 #include <eepp/graphics/cconsole.hpp>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/graphics/renderer/cgl.hpp>
 #include <eepp/audio/audiolistener.hpp>
-#include <eepp/window/cinput.hpp>
-#include <eepp/window/ccursormanager.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/input.hpp>
+#include <eepp/window/cursormanager.hpp>
+#include <eepp/window/window.hpp>
 #include <algorithm>
 #include <cstdarg>
 
diff --git a/src/eepp/graphics/cframebuffer.cpp b/src/eepp/graphics/cframebuffer.cpp
index b3967c534..ef45e4225 100644
--- a/src/eepp/graphics/cframebuffer.cpp
+++ b/src/eepp/graphics/cframebuffer.cpp
@@ -1,11 +1,11 @@
 #include <eepp/graphics/cframebuffer.hpp>
 #include <eepp/graphics/cglobalbatchrenderer.hpp>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/graphics/glextensions.hpp>
 #include <eepp/graphics/renderer/cgl.hpp>
 #include <eepp/graphics/cframebufferfbo.hpp>
 #include <eepp/graphics/cframebuffermanager.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/window.hpp>
 using namespace EE::Graphics::Private;
 
 namespace EE { namespace Graphics {
diff --git a/src/eepp/graphics/cframebufferfbo.cpp b/src/eepp/graphics/cframebufferfbo.cpp
index dab4aa7bd..3b84a7d1f 100644
--- a/src/eepp/graphics/cframebufferfbo.cpp
+++ b/src/eepp/graphics/cframebufferfbo.cpp
@@ -1,6 +1,6 @@
 #include <eepp/graphics/cframebufferfbo.hpp>
 #include <eepp/graphics/ctexturefactory.hpp>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/graphics/glextensions.hpp>
 #include <eepp/graphics/renderer/cgl.hpp>
 #include <eepp/graphics/cglobalbatchrenderer.hpp>
diff --git a/src/eepp/graphics/cparticlesystem.cpp b/src/eepp/graphics/cparticlesystem.cpp
index e4e98980a..34f4fe55c 100755
--- a/src/eepp/graphics/cparticlesystem.cpp
+++ b/src/eepp/graphics/cparticlesystem.cpp
@@ -4,7 +4,7 @@
 #include <eepp/graphics/ctexturefactory.hpp>
 #include <eepp/graphics/cbatchrenderer.hpp>
 #include <eepp/graphics/cglobalbatchrenderer.hpp>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 
 using namespace EE::Window;
 
diff --git a/src/eepp/graphics/csprite.cpp b/src/eepp/graphics/csprite.cpp
index ae0c98ef9..847cfac9b 100755
--- a/src/eepp/graphics/csprite.cpp
+++ b/src/eepp/graphics/csprite.cpp
@@ -1,5 +1,5 @@
 #include <eepp/graphics/csprite.hpp>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/graphics/cglobaltextureatlas.hpp>
 #include <eepp/graphics/ctextureatlasmanager.hpp>
 #include <eepp/math/originpoint.hpp>
diff --git a/src/eepp/graphics/ctextureloader.cpp b/src/eepp/graphics/ctextureloader.cpp
index 2eed76716..dfb1480fb 100644
--- a/src/eepp/graphics/ctextureloader.cpp
+++ b/src/eepp/graphics/ctextureloader.cpp
@@ -1,7 +1,7 @@
 #include <eepp/graphics/ctextureloader.hpp>
 #include <eepp/graphics/ctexture.hpp>
 #include <eepp/graphics/ctexturefactory.hpp>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/graphics/glextensions.hpp>
 #include <eepp/graphics/renderer/cgl.hpp>
 #include <eepp/system/iostreamfile.hpp>
diff --git a/src/eepp/physics/cspace.cpp b/src/eepp/physics/cspace.cpp
index f514ddbe1..e6ddde641 100644
--- a/src/eepp/physics/cspace.cpp
+++ b/src/eepp/physics/cspace.cpp
@@ -2,7 +2,7 @@
 #include <eepp/physics/cphysicsmanager.hpp>
 
 #ifdef PHYSICS_RENDERER_ENABLED
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/graphics/cglobalbatchrenderer.hpp>
 using namespace EE::Graphics;
 #endif
diff --git a/src/eepp/system/sys.cpp b/src/eepp/system/sys.cpp
index e248b89f9..c2879350e 100644
--- a/src/eepp/system/sys.cpp
+++ b/src/eepp/system/sys.cpp
@@ -8,7 +8,7 @@
 
 // This taints the System module!
 #if EE_PLATFORM == EE_PLATFORM_ANDROID
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #endif
 
 #if defined( EE_PLATFORM_POSIX )
diff --git a/src/eepp/ui/cuidragable.cpp b/src/eepp/ui/cuidragable.cpp
index a6a787303..0c770b78d 100644
--- a/src/eepp/ui/cuidragable.cpp
+++ b/src/eepp/ui/cuidragable.cpp
@@ -1,6 +1,6 @@
 #include <eepp/ui/cuidragable.hpp>
 #include <eepp/ui/cuimanager.hpp>
-#include <eepp/window/cinput.hpp>
+#include <eepp/window/input.hpp>
 
 namespace EE { namespace UI {
 
diff --git a/src/eepp/ui/cuimanager.cpp b/src/eepp/ui/cuimanager.cpp
index 44488c5cc..c7b61936d 100644
--- a/src/eepp/ui/cuimanager.cpp
+++ b/src/eepp/ui/cuimanager.cpp
@@ -1,6 +1,6 @@
 #include <eepp/ui/cuimanager.hpp>
-#include <eepp/window/cengine.hpp>
-#include <eepp/window/ccursormanager.hpp>
+#include <eepp/window/engine.hpp>
+#include <eepp/window/cursormanager.hpp>
 #include <eepp/graphics/cglobalbatchrenderer.hpp>
 #include <algorithm>
 
diff --git a/src/eepp/ui/cuitextbox.cpp b/src/eepp/ui/cuitextbox.cpp
index 392066db1..aeb88b5fe 100644
--- a/src/eepp/ui/cuitextbox.cpp
+++ b/src/eepp/ui/cuitextbox.cpp
@@ -4,7 +4,7 @@
 #include <eepp/graphics/ctextcache.hpp>
 #include <eepp/graphics/cfont.hpp>
 #include <eepp/graphics/cprimitives.hpp>
-#include <eepp/window/cclipboard.hpp>
+#include <eepp/window/clipboard.hpp>
 
 namespace EE { namespace UI {
 
diff --git a/src/eepp/ui/cuitextinput.cpp b/src/eepp/ui/cuitextinput.cpp
index 1b74a685a..4bd05c879 100644
--- a/src/eepp/ui/cuitextinput.cpp
+++ b/src/eepp/ui/cuitextinput.cpp
@@ -1,6 +1,6 @@
 #include <eepp/ui/cuitextinput.hpp>
 #include <eepp/ui/cuimanager.hpp>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/graphics/renderer/cgl.hpp>
 #include <eepp/graphics/cprimitives.hpp>
 #include <eepp/graphics/cfont.hpp>
diff --git a/src/eepp/window/cbackend.hpp b/src/eepp/window/backend.hpp
similarity index 100%
rename from src/eepp/window/cbackend.hpp
rename to src/eepp/window/backend.hpp
diff --git a/src/eepp/window/backend/SDL/cbackendsdl.cpp b/src/eepp/window/backend/SDL/backendsdl.cpp
similarity index 83%
rename from src/eepp/window/backend/SDL/cbackendsdl.cpp
rename to src/eepp/window/backend/SDL/backendsdl.cpp
index ff49b1187..619d7aab1 100644
--- a/src/eepp/window/backend/SDL/cbackendsdl.cpp
+++ b/src/eepp/window/backend/SDL/backendsdl.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SDL/cbackendsdl.hpp>
+#include <eepp/window/backend/SDL/backendsdl.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
diff --git a/src/eepp/window/backend/SDL/cbackendsdl.hpp b/src/eepp/window/backend/SDL/backendsdl.hpp
similarity index 80%
rename from src/eepp/window/backend/SDL/cbackendsdl.hpp
rename to src/eepp/window/backend/SDL/backendsdl.hpp
index c69247d2a..2c8f94fd9 100644
--- a/src/eepp/window/backend/SDL/cbackendsdl.hpp
+++ b/src/eepp/window/backend/SDL/backendsdl.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCBACKENDSDL_HPP
 #define EE_WINDOWCBACKENDSDL_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL/base.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
-#include <eepp/window/backend/SDL/cwindowsdl.hpp>
+#include <eepp/window/backend/SDL/windowsdl.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL {
 
diff --git a/src/eepp/window/backend/SDL/cclipboardsdl.cpp b/src/eepp/window/backend/SDL/clipboardsdl.cpp
similarity index 98%
rename from src/eepp/window/backend/SDL/cclipboardsdl.cpp
rename to src/eepp/window/backend/SDL/clipboardsdl.cpp
index e6acc447e..c6bb663f3 100644
--- a/src/eepp/window/backend/SDL/cclipboardsdl.cpp
+++ b/src/eepp/window/backend/SDL/clipboardsdl.cpp
@@ -1,8 +1,8 @@
-#include <eepp/window/backend/SDL/cclipboardsdl.hpp>
+#include <eepp/window/backend/SDL/clipboardsdl.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
-#include <eepp/window/backend/SDL/cwindowsdl.hpp>
+#include <eepp/window/backend/SDL/windowsdl.hpp>
 #include <climits>
 
 #if !defined( EE_COMPILER_MSVC )
diff --git a/src/eepp/window/backend/SDL/cclipboardsdl.hpp b/src/eepp/window/backend/SDL/clipboardsdl.hpp
similarity index 94%
rename from src/eepp/window/backend/SDL/cclipboardsdl.hpp
rename to src/eepp/window/backend/SDL/clipboardsdl.hpp
index ee5cabe98..927fb9ee1 100644
--- a/src/eepp/window/backend/SDL/cclipboardsdl.hpp
+++ b/src/eepp/window/backend/SDL/clipboardsdl.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCCLIPBOARDSDL_HPP
 #define EE_WINDOWCCLIPBOARDSDL_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL/base.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
-#include <eepp/window/cclipboard.hpp>
+#include <eepp/window/clipboard.hpp>
 
 struct SDL_SysWMinfo;
 
diff --git a/src/eepp/window/backend/SDL/ccursormanagersdl.cpp b/src/eepp/window/backend/SDL/cursormanagersdl.cpp
similarity index 93%
rename from src/eepp/window/backend/SDL/ccursormanagersdl.cpp
rename to src/eepp/window/backend/SDL/cursormanagersdl.cpp
index 3d2196966..95f2cac1f 100644
--- a/src/eepp/window/backend/SDL/ccursormanagersdl.cpp
+++ b/src/eepp/window/backend/SDL/cursormanagersdl.cpp
@@ -1,9 +1,9 @@
-#include <eepp/window/backend/SDL/ccursormanagersdl.hpp>
-#include <eepp/window/backend/SDL/ccursorsdl.hpp>
+#include <eepp/window/backend/SDL/cursormanagersdl.hpp>
+#include <eepp/window/backend/SDL/cursorsdl.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
-#include <eepp/window/cplatformimpl.hpp>
+#include <eepp/window/platformimpl.hpp>
 
 #if !defined( EE_COMPILER_MSVC )
 #include <SDL/SDL.h>
diff --git a/src/eepp/window/backend/SDL/ccursormanagersdl.hpp b/src/eepp/window/backend/SDL/cursormanagersdl.hpp
similarity index 95%
rename from src/eepp/window/backend/SDL/ccursormanagersdl.hpp
rename to src/eepp/window/backend/SDL/cursormanagersdl.hpp
index baab2420e..0c0ae4d71 100644
--- a/src/eepp/window/backend/SDL/ccursormanagersdl.hpp
+++ b/src/eepp/window/backend/SDL/cursormanagersdl.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCCURSORMANAGERSDL_HPP
 #define EE_WINDOWCCURSORMANAGERSDL_HPP
 
-#include <eepp/window/ccursormanager.hpp>
+#include <eepp/window/cursormanager.hpp>
 #include <eepp/window/backend/SDL/base.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
diff --git a/src/eepp/window/backend/SDL/ccursorsdl.cpp b/src/eepp/window/backend/SDL/cursorsdl.cpp
similarity index 92%
rename from src/eepp/window/backend/SDL/ccursorsdl.cpp
rename to src/eepp/window/backend/SDL/cursorsdl.cpp
index 91faf31f3..aba25e4df 100644
--- a/src/eepp/window/backend/SDL/ccursorsdl.cpp
+++ b/src/eepp/window/backend/SDL/cursorsdl.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SDL/ccursorsdl.hpp>
+#include <eepp/window/backend/SDL/cursorsdl.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
diff --git a/src/eepp/window/backend/SDL/ccursorsdl.hpp b/src/eepp/window/backend/SDL/cursorsdl.hpp
similarity index 95%
rename from src/eepp/window/backend/SDL/ccursorsdl.hpp
rename to src/eepp/window/backend/SDL/cursorsdl.hpp
index 2fcf67d85..bfe84aafd 100644
--- a/src/eepp/window/backend/SDL/ccursorsdl.hpp
+++ b/src/eepp/window/backend/SDL/cursorsdl.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCCURSORSDL_HPP
 #define EE_WINDOWCCURSORSDL_HPP
 
-#include <eepp/window/ccursor.hpp>
+#include <eepp/window/cursor.hpp>
 #include <eepp/window/backend/SDL/base.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
diff --git a/src/eepp/window/backend/SDL/cinputsdl.cpp b/src/eepp/window/backend/SDL/inputsdl.cpp
similarity index 97%
rename from src/eepp/window/backend/SDL/cinputsdl.cpp
rename to src/eepp/window/backend/SDL/inputsdl.cpp
index 9b820e776..ae86a6286 100644
--- a/src/eepp/window/backend/SDL/cinputsdl.cpp
+++ b/src/eepp/window/backend/SDL/inputsdl.cpp
@@ -22,9 +22,9 @@
 #endif
 #endif
 
-#include <eepp/window/backend/SDL/cinputsdl.hpp>
-#include <eepp/window/backend/SDL/cjoystickmanagersdl.hpp>
-#include <eepp/window/backend/SDL/ccursormanagersdl.hpp>
+#include <eepp/window/backend/SDL/inputsdl.hpp>
+#include <eepp/window/backend/SDL/joystickmanagersdl.hpp>
+#include <eepp/window/backend/SDL/cursormanagersdl.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL {
 
diff --git a/src/eepp/window/backend/SDL/cinputsdl.hpp b/src/eepp/window/backend/SDL/inputsdl.hpp
similarity index 88%
rename from src/eepp/window/backend/SDL/cinputsdl.hpp
rename to src/eepp/window/backend/SDL/inputsdl.hpp
index 1f15c9364..080ba5e25 100644
--- a/src/eepp/window/backend/SDL/cinputsdl.hpp
+++ b/src/eepp/window/backend/SDL/inputsdl.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCINPUTSDL_HPP
 #define EE_WINDOWCINPUTSDL_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL/base.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
-#include <eepp/window/cinput.hpp>
+#include <eepp/window/input.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL {
 
diff --git a/src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp b/src/eepp/window/backend/SDL/joystickmanagersdl.cpp
similarity index 90%
rename from src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp
rename to src/eepp/window/backend/SDL/joystickmanagersdl.cpp
index 744d579c0..1328f796c 100644
--- a/src/eepp/window/backend/SDL/cjoystickmanagersdl.cpp
+++ b/src/eepp/window/backend/SDL/joystickmanagersdl.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/backend/SDL/cjoystickmanagersdl.hpp>
-#include <eepp/window/backend/SDL/cjoysticksdl.hpp>
+#include <eepp/window/backend/SDL/joystickmanagersdl.hpp>
+#include <eepp/window/backend/SDL/joysticksdl.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
diff --git a/src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp b/src/eepp/window/backend/SDL/joystickmanagersdl.hpp
similarity index 85%
rename from src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp
rename to src/eepp/window/backend/SDL/joystickmanagersdl.hpp
index d5edcf8ab..889cd3272 100644
--- a/src/eepp/window/backend/SDL/cjoystickmanagersdl.hpp
+++ b/src/eepp/window/backend/SDL/joystickmanagersdl.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCJOYSTICKMANAGERSDL_HPP
 #define EE_WINDOWCJOYSTICKMANAGERSDL_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL/base.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
-#include <eepp/window/cjoystickmanager.hpp>
+#include <eepp/window/joystickmanager.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL {
 
diff --git a/src/eepp/window/backend/SDL/cjoysticksdl.cpp b/src/eepp/window/backend/SDL/joysticksdl.cpp
similarity index 96%
rename from src/eepp/window/backend/SDL/cjoysticksdl.cpp
rename to src/eepp/window/backend/SDL/joysticksdl.cpp
index 1df0cec7b..f7568fe34 100644
--- a/src/eepp/window/backend/SDL/cjoysticksdl.cpp
+++ b/src/eepp/window/backend/SDL/joysticksdl.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SDL/cjoysticksdl.hpp>
+#include <eepp/window/backend/SDL/joysticksdl.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
diff --git a/src/eepp/window/backend/SDL/cjoysticksdl.hpp b/src/eepp/window/backend/SDL/joysticksdl.hpp
similarity index 90%
rename from src/eepp/window/backend/SDL/cjoysticksdl.hpp
rename to src/eepp/window/backend/SDL/joysticksdl.hpp
index 52f102163..740adab75 100644
--- a/src/eepp/window/backend/SDL/cjoysticksdl.hpp
+++ b/src/eepp/window/backend/SDL/joysticksdl.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCJOYSTICKSDL_HPP
 #define EE_WINDOWCJOYSTICKSDL_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL/base.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
-#include <eepp/window/cjoystick.hpp>
+#include <eepp/window/joystick.hpp>
 #if !defined( EE_COMPILER_MSVC )
 #include <SDL/SDL.h>
 #else
diff --git a/src/eepp/window/backend/SDL/cwindowsdl.cpp b/src/eepp/window/backend/SDL/windowsdl.cpp
similarity index 98%
rename from src/eepp/window/backend/SDL/cwindowsdl.cpp
rename to src/eepp/window/backend/SDL/windowsdl.cpp
index 884e7c6ea..8be31875a 100644
--- a/src/eepp/window/backend/SDL/cwindowsdl.cpp
+++ b/src/eepp/window/backend/SDL/windowsdl.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SDL/cwindowsdl.hpp>
+#include <eepp/window/backend/SDL/windowsdl.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
@@ -18,9 +18,9 @@
 
 #include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
 
-#include <eepp/window/backend/SDL/cclipboardsdl.hpp>
-#include <eepp/window/backend/SDL/cinputsdl.hpp>
-#include <eepp/window/backend/SDL/ccursormanagersdl.hpp>
+#include <eepp/window/backend/SDL/clipboardsdl.hpp>
+#include <eepp/window/backend/SDL/inputsdl.hpp>
+#include <eepp/window/backend/SDL/cursormanagersdl.hpp>
 #include <eepp/window/platform/platformimpl.hpp>
 
 #include <eepp/graphics/renderer/cgl.hpp>
diff --git a/src/eepp/window/backend/SDL/cwindowsdl.hpp b/src/eepp/window/backend/SDL/windowsdl.hpp
similarity index 94%
rename from src/eepp/window/backend/SDL/cwindowsdl.hpp
rename to src/eepp/window/backend/SDL/windowsdl.hpp
index d86cc9355..8c8ad7fb1 100644
--- a/src/eepp/window/backend/SDL/cwindowsdl.hpp
+++ b/src/eepp/window/backend/SDL/windowsdl.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCWINDOWSDL_HPP
 #define EE_WINDOWCWINDOWSDL_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL/base.hpp>
 
 #ifdef EE_BACKEND_SDL_1_2
 
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/window.hpp>
 
 struct SDL_Surface;
 struct SDL_SysWMinfo;
diff --git a/src/eepp/window/backend/SDL2/cbackendsdl2.cpp b/src/eepp/window/backend/SDL2/backendsdl2.cpp
similarity index 89%
rename from src/eepp/window/backend/SDL2/cbackendsdl2.cpp
rename to src/eepp/window/backend/SDL2/backendsdl2.cpp
index 62881b03c..2b717809c 100644
--- a/src/eepp/window/backend/SDL2/cbackendsdl2.cpp
+++ b/src/eepp/window/backend/SDL2/backendsdl2.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SDL2/cbackendsdl2.hpp>
+#include <eepp/window/backend/SDL2/backendsdl2.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
diff --git a/src/eepp/window/backend/SDL2/cbackendsdl2.hpp b/src/eepp/window/backend/SDL2/backendsdl2.hpp
similarity index 80%
rename from src/eepp/window/backend/SDL2/cbackendsdl2.hpp
rename to src/eepp/window/backend/SDL2/backendsdl2.hpp
index d21227408..efa6bd1b4 100644
--- a/src/eepp/window/backend/SDL2/cbackendsdl2.hpp
+++ b/src/eepp/window/backend/SDL2/backendsdl2.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCBACKENDSDL2_HPP
 #define EE_WINDOWCBACKENDSDL2_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL2/base.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
-#include <eepp/window/backend/SDL2/cwindowsdl2.hpp>
+#include <eepp/window/backend/SDL2/windowsdl2.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL2 {
 
diff --git a/src/eepp/window/backend/SDL2/cclipboardsdl2.cpp b/src/eepp/window/backend/SDL2/clipboardsdl2.cpp
similarity index 85%
rename from src/eepp/window/backend/SDL2/cclipboardsdl2.cpp
rename to src/eepp/window/backend/SDL2/clipboardsdl2.cpp
index d5cfbcba9..fb3da59d8 100644
--- a/src/eepp/window/backend/SDL2/cclipboardsdl2.cpp
+++ b/src/eepp/window/backend/SDL2/clipboardsdl2.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/backend/SDL2/cclipboardsdl2.hpp>
-#include <eepp/window/backend/SDL2/cwindowsdl2.hpp>
+#include <eepp/window/backend/SDL2/clipboardsdl2.hpp>
+#include <eepp/window/backend/SDL2/windowsdl2.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
diff --git a/src/eepp/window/backend/SDL2/cclipboardsdl2.hpp b/src/eepp/window/backend/SDL2/clipboardsdl2.hpp
similarity index 88%
rename from src/eepp/window/backend/SDL2/cclipboardsdl2.hpp
rename to src/eepp/window/backend/SDL2/clipboardsdl2.hpp
index e6c84cb2f..6f0aeef1b 100644
--- a/src/eepp/window/backend/SDL2/cclipboardsdl2.hpp
+++ b/src/eepp/window/backend/SDL2/clipboardsdl2.hpp
@@ -1,13 +1,13 @@
 #ifndef EE_WINDOWCCLIPBOARDSDL2_HPP
 #define EE_WINDOWCCLIPBOARDSDL2_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL2/base.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
 #include <eepp/window/base.hpp>
-#include <eepp/window/cclipboard.hpp>
+#include <eepp/window/clipboard.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL2 {
 
diff --git a/src/eepp/window/backend/SDL2/ccursormanagersdl2.cpp b/src/eepp/window/backend/SDL2/cursormanagersdl2.cpp
similarity index 93%
rename from src/eepp/window/backend/SDL2/ccursormanagersdl2.cpp
rename to src/eepp/window/backend/SDL2/cursormanagersdl2.cpp
index 461adf1f3..a85f13624 100644
--- a/src/eepp/window/backend/SDL2/ccursormanagersdl2.cpp
+++ b/src/eepp/window/backend/SDL2/cursormanagersdl2.cpp
@@ -1,6 +1,6 @@
-#include <eepp/window/backend/SDL2/ccursormanagersdl2.hpp>
-#include <eepp/window/backend/SDL2/ccursorsdl2.hpp>
-#include <eepp/window/cplatformimpl.hpp>
+#include <eepp/window/backend/SDL2/cursormanagersdl2.hpp>
+#include <eepp/window/backend/SDL2/cursorsdl2.hpp>
+#include <eepp/window/platformimpl.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
diff --git a/src/eepp/window/backend/SDL2/ccursormanagersdl2.hpp b/src/eepp/window/backend/SDL2/cursormanagersdl2.hpp
similarity index 95%
rename from src/eepp/window/backend/SDL2/ccursormanagersdl2.hpp
rename to src/eepp/window/backend/SDL2/cursormanagersdl2.hpp
index 1c32ab021..e1d7d1de2 100644
--- a/src/eepp/window/backend/SDL2/ccursormanagersdl2.hpp
+++ b/src/eepp/window/backend/SDL2/cursormanagersdl2.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCCURSORMANAGERSDL2_HPP
 #define EE_WINDOWCCURSORMANAGERSDL2_HPP
 
-#include <eepp/window/ccursormanager.hpp>
+#include <eepp/window/cursormanager.hpp>
 #include <eepp/window/backend/SDL2/base.hpp>
 
 #ifdef EE_BACKEND_SDL2
diff --git a/src/eepp/window/backend/SDL2/ccursorsdl2.cpp b/src/eepp/window/backend/SDL2/cursorsdl2.cpp
similarity index 97%
rename from src/eepp/window/backend/SDL2/ccursorsdl2.cpp
rename to src/eepp/window/backend/SDL2/cursorsdl2.cpp
index 932ec06d8..c17b1b0fb 100644
--- a/src/eepp/window/backend/SDL2/ccursorsdl2.cpp
+++ b/src/eepp/window/backend/SDL2/cursorsdl2.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SDL2/ccursorsdl2.hpp>
+#include <eepp/window/backend/SDL2/cursorsdl2.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
diff --git a/src/eepp/window/backend/SDL2/ccursorsdl2.hpp b/src/eepp/window/backend/SDL2/cursorsdl2.hpp
similarity index 95%
rename from src/eepp/window/backend/SDL2/ccursorsdl2.hpp
rename to src/eepp/window/backend/SDL2/cursorsdl2.hpp
index 517962106..723fcba78 100644
--- a/src/eepp/window/backend/SDL2/ccursorsdl2.hpp
+++ b/src/eepp/window/backend/SDL2/cursorsdl2.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCCURSORSDL2_HPP
 #define EE_WINDOWCCURSORSDL2_HPP
 
-#include <eepp/window/ccursor.hpp>
+#include <eepp/window/cursor.hpp>
 #include <eepp/window/backend/SDL2/base.hpp>
 
 #ifdef EE_BACKEND_SDL2
diff --git a/src/eepp/window/backend/SDL2/cinputsdl2.cpp b/src/eepp/window/backend/SDL2/inputsdl2.cpp
similarity index 98%
rename from src/eepp/window/backend/SDL2/cinputsdl2.cpp
rename to src/eepp/window/backend/SDL2/inputsdl2.cpp
index 965ddcd9a..af17c5b06 100644
--- a/src/eepp/window/backend/SDL2/cinputsdl2.cpp
+++ b/src/eepp/window/backend/SDL2/inputsdl2.cpp
@@ -2,10 +2,10 @@
 
 #ifdef EE_BACKEND_SDL2
 
-#include <eepp/window/backend/SDL2/cinputsdl2.hpp>
-#include <eepp/window/backend/SDL2/cjoystickmanagersdl2.hpp>
-#include <eepp/window/backend/SDL2/ccursormanagersdl2.hpp>
-#include <eepp/window/backend/SDL2/cwindowsdl2.hpp>
+#include <eepp/window/backend/SDL2/inputsdl2.hpp>
+#include <eepp/window/backend/SDL2/joystickmanagersdl2.hpp>
+#include <eepp/window/backend/SDL2/cursormanagersdl2.hpp>
+#include <eepp/window/backend/SDL2/windowsdl2.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL2 {
 
diff --git a/src/eepp/window/backend/SDL2/cinputsdl2.hpp b/src/eepp/window/backend/SDL2/inputsdl2.hpp
similarity index 89%
rename from src/eepp/window/backend/SDL2/cinputsdl2.hpp
rename to src/eepp/window/backend/SDL2/inputsdl2.hpp
index 924e62e15..e3b7bfeac 100644
--- a/src/eepp/window/backend/SDL2/cinputsdl2.hpp
+++ b/src/eepp/window/backend/SDL2/inputsdl2.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCINPUTSDL2_HPP
 #define EE_WINDOWCINPUTSDL2_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL2/base.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
-#include <eepp/window/cinput.hpp>
+#include <eepp/window/input.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL2 {
 
diff --git a/src/eepp/window/backend/SDL2/cjoystickmanagersdl2.cpp b/src/eepp/window/backend/SDL2/joystickmanagersdl2.cpp
similarity index 89%
rename from src/eepp/window/backend/SDL2/cjoystickmanagersdl2.cpp
rename to src/eepp/window/backend/SDL2/joystickmanagersdl2.cpp
index 8a9011492..27113e9cf 100644
--- a/src/eepp/window/backend/SDL2/cjoystickmanagersdl2.cpp
+++ b/src/eepp/window/backend/SDL2/joystickmanagersdl2.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/backend/SDL2/cjoystickmanagersdl2.hpp>
-#include <eepp/window/backend/SDL2/cjoysticksdl2.hpp>
+#include <eepp/window/backend/SDL2/joystickmanagersdl2.hpp>
+#include <eepp/window/backend/SDL2/joysticksdl2.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
diff --git a/src/eepp/window/backend/SDL2/cjoystickmanagersdl2.hpp b/src/eepp/window/backend/SDL2/joystickmanagersdl2.hpp
similarity index 85%
rename from src/eepp/window/backend/SDL2/cjoystickmanagersdl2.hpp
rename to src/eepp/window/backend/SDL2/joystickmanagersdl2.hpp
index 5f45abea1..2605746a4 100644
--- a/src/eepp/window/backend/SDL2/cjoystickmanagersdl2.hpp
+++ b/src/eepp/window/backend/SDL2/joystickmanagersdl2.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCJOYSTICKMANAGERSDL2_HPP
 #define EE_WINDOWCJOYSTICKMANAGERSDL2_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL2/base.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
-#include <eepp/window/cjoystickmanager.hpp>
+#include <eepp/window/joystickmanager.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL2 {
 
diff --git a/src/eepp/window/backend/SDL2/cjoysticksdl2.cpp b/src/eepp/window/backend/SDL2/joysticksdl2.cpp
similarity index 97%
rename from src/eepp/window/backend/SDL2/cjoysticksdl2.cpp
rename to src/eepp/window/backend/SDL2/joysticksdl2.cpp
index c225201d1..04f8da2e0 100644
--- a/src/eepp/window/backend/SDL2/cjoysticksdl2.cpp
+++ b/src/eepp/window/backend/SDL2/joysticksdl2.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SDL2/cjoysticksdl2.hpp>
+#include <eepp/window/backend/SDL2/joysticksdl2.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
diff --git a/src/eepp/window/backend/SDL2/cjoysticksdl2.hpp b/src/eepp/window/backend/SDL2/joysticksdl2.hpp
similarity index 89%
rename from src/eepp/window/backend/SDL2/cjoysticksdl2.hpp
rename to src/eepp/window/backend/SDL2/joysticksdl2.hpp
index 091973bea..0fc73edb4 100644
--- a/src/eepp/window/backend/SDL2/cjoysticksdl2.hpp
+++ b/src/eepp/window/backend/SDL2/joysticksdl2.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCJOYSTICKSDL2_HPP
 #define EE_WINDOWCJOYSTICKSDL2_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL2/base.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
-#include <eepp/window/cjoystick.hpp>
+#include <eepp/window/joystick.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SDL2 {
 
diff --git a/src/eepp/window/backend/SDL2/cwindowsdl2.cpp b/src/eepp/window/backend/SDL2/windowsdl2.cpp
similarity index 98%
rename from src/eepp/window/backend/SDL2/cwindowsdl2.cpp
rename to src/eepp/window/backend/SDL2/windowsdl2.cpp
index d4890f804..432973f59 100644
--- a/src/eepp/window/backend/SDL2/cwindowsdl2.cpp
+++ b/src/eepp/window/backend/SDL2/windowsdl2.cpp
@@ -3,12 +3,12 @@
 #ifdef EE_BACKEND_SDL2
 
 #include <eepp/helper/SOIL2/src/SOIL2/stb_image.h>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/window/platform/platformimpl.hpp>
-#include <eepp/window/backend/SDL2/cwindowsdl2.hpp>
-#include <eepp/window/backend/SDL2/cclipboardsdl2.hpp>
-#include <eepp/window/backend/SDL2/cinputsdl2.hpp>
-#include <eepp/window/backend/SDL2/ccursormanagersdl2.hpp>
+#include <eepp/window/backend/SDL2/windowsdl2.hpp>
+#include <eepp/window/backend/SDL2/clipboardsdl2.hpp>
+#include <eepp/window/backend/SDL2/inputsdl2.hpp>
+#include <eepp/window/backend/SDL2/cursormanagersdl2.hpp>
 #include <eepp/window/backend/SDL2/wminfo.hpp>
 
 #include <eepp/graphics/cglobalbatchrenderer.hpp>
diff --git a/src/eepp/window/backend/SDL2/cwindowsdl2.hpp b/src/eepp/window/backend/SDL2/windowsdl2.hpp
similarity index 97%
rename from src/eepp/window/backend/SDL2/cwindowsdl2.hpp
rename to src/eepp/window/backend/SDL2/windowsdl2.hpp
index fec822977..55ac4b664 100644
--- a/src/eepp/window/backend/SDL2/cwindowsdl2.hpp
+++ b/src/eepp/window/backend/SDL2/windowsdl2.hpp
@@ -1,12 +1,12 @@
 #ifndef EE_WINDOWCWINDOWSDL2_HPP
 #define EE_WINDOWCWINDOWSDL2_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 #include <eepp/window/backend/SDL2/base.hpp>
 
 #ifdef EE_BACKEND_SDL2
 
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/window.hpp>
 #include <eepp/window/backend/SDL2/wminfo.hpp>
 
 #if EE_PLATFORM == EE_PLATFORM_WIN || EE_PLATFORM == EE_PLATFORM_MACOSX || defined( EE_X11_PLATFORM ) || EE_PLATFORM == EE_PLATFORM_IOS
diff --git a/src/eepp/window/backend/SFML/cbackendsfml.hpp b/src/eepp/window/backend/SFML/backendsfml.hpp
similarity index 80%
rename from src/eepp/window/backend/SFML/cbackendsfml.hpp
rename to src/eepp/window/backend/SFML/backendsfml.hpp
index 814c6427d..ccff08a60 100644
--- a/src/eepp/window/backend/SFML/cbackendsfml.hpp
+++ b/src/eepp/window/backend/SFML/backendsfml.hpp
@@ -3,8 +3,8 @@
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
-#include <eepp/window/cbackend.hpp>
-#include <eepp/window/backend/SFML/cwindowsfml.hpp>
+#include <eepp/window/backend.hpp>
+#include <eepp/window/backend/SFML/windowsfml.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SFML {
 
diff --git a/src/eepp/window/backend/SFML/cclipboardsfml.cpp b/src/eepp/window/backend/SFML/clipboardsfml.cpp
similarity index 81%
rename from src/eepp/window/backend/SFML/cclipboardsfml.cpp
rename to src/eepp/window/backend/SFML/clipboardsfml.cpp
index 580ecc19e..76f757ce3 100644
--- a/src/eepp/window/backend/SFML/cclipboardsfml.cpp
+++ b/src/eepp/window/backend/SFML/clipboardsfml.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/backend/SFML/cclipboardsfml.hpp>
-#include <eepp/window/backend/SFML/cwindowsfml.hpp>
+#include <eepp/window/backend/SFML/clipboardsfml.hpp>
+#include <eepp/window/backend/SFML/windowsfml.hpp>
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
diff --git a/src/eepp/window/backend/SFML/cclipboardsfml.hpp b/src/eepp/window/backend/SFML/clipboardsfml.hpp
similarity index 93%
rename from src/eepp/window/backend/SFML/cclipboardsfml.hpp
rename to src/eepp/window/backend/SFML/clipboardsfml.hpp
index 3642ef90a..63f460de1 100644
--- a/src/eepp/window/backend/SFML/cclipboardsfml.hpp
+++ b/src/eepp/window/backend/SFML/clipboardsfml.hpp
@@ -4,7 +4,7 @@
 #ifdef EE_BACKEND_SFML_ACTIVE
 
 #include <eepp/window/base.hpp>
-#include <eepp/window/cclipboard.hpp>
+#include <eepp/window/clipboard.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SFML {
 
diff --git a/src/eepp/window/backend/SFML/ccursormanagersfml.cpp b/src/eepp/window/backend/SFML/cursormanagersfml.cpp
similarity index 91%
rename from src/eepp/window/backend/SFML/ccursormanagersfml.cpp
rename to src/eepp/window/backend/SFML/cursormanagersfml.cpp
index 2b877f84e..58abb23db 100644
--- a/src/eepp/window/backend/SFML/ccursormanagersfml.cpp
+++ b/src/eepp/window/backend/SFML/cursormanagersfml.cpp
@@ -1,6 +1,6 @@
-#include <eepp/window/backend/SFML/ccursormanagersfml.hpp>
-#include <eepp/window/backend/SFML/ccursorsfml.hpp>
-#include <eepp/window/backend/SFML/cwindowsfml.hpp>
+#include <eepp/window/backend/SFML/cursormanagersfml.hpp>
+#include <eepp/window/backend/SFML/cursorsfml.hpp>
+#include <eepp/window/backend/SFML/windowsfml.hpp>
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
@@ -8,7 +8,7 @@
 #undef None
 #endif
 #include <SFML/Window.hpp>
-#include <eepp/window/cplatformimpl.hpp>
+#include <eepp/window/platformimpl.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SFML {
 
diff --git a/src/eepp/window/backend/SFML/ccursormanagersfml.hpp b/src/eepp/window/backend/SFML/cursormanagersfml.hpp
similarity index 95%
rename from src/eepp/window/backend/SFML/ccursormanagersfml.hpp
rename to src/eepp/window/backend/SFML/cursormanagersfml.hpp
index 4787aa3d0..3bfa0e281 100644
--- a/src/eepp/window/backend/SFML/ccursormanagersfml.hpp
+++ b/src/eepp/window/backend/SFML/cursormanagersfml.hpp
@@ -3,7 +3,7 @@
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
-#include <eepp/window/ccursormanager.hpp>
+#include <eepp/window/cursormanager.hpp>
 
 using namespace EE::Window;
 
diff --git a/src/eepp/window/backend/SFML/ccursorsfml.cpp b/src/eepp/window/backend/SFML/cursorsfml.cpp
similarity index 92%
rename from src/eepp/window/backend/SFML/ccursorsfml.cpp
rename to src/eepp/window/backend/SFML/cursorsfml.cpp
index b89d6a2c7..11e9fe13a 100644
--- a/src/eepp/window/backend/SFML/ccursorsfml.cpp
+++ b/src/eepp/window/backend/SFML/cursorsfml.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SFML/ccursorsfml.hpp>
+#include <eepp/window/backend/SFML/cursorsfml.hpp>
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
diff --git a/src/eepp/window/backend/SFML/ccursorsfml.hpp b/src/eepp/window/backend/SFML/cursorsfml.hpp
similarity index 95%
rename from src/eepp/window/backend/SFML/ccursorsfml.hpp
rename to src/eepp/window/backend/SFML/cursorsfml.hpp
index 77a42d10d..904a49896 100644
--- a/src/eepp/window/backend/SFML/ccursorsfml.hpp
+++ b/src/eepp/window/backend/SFML/cursorsfml.hpp
@@ -3,7 +3,7 @@
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
-#include <eepp/window/ccursor.hpp>
+#include <eepp/window/cursor.hpp>
 
 using namespace EE::Window;
 
diff --git a/src/eepp/window/backend/SFML/cinputsfml.cpp b/src/eepp/window/backend/SFML/inputsfml.cpp
similarity index 98%
rename from src/eepp/window/backend/SFML/cinputsfml.cpp
rename to src/eepp/window/backend/SFML/inputsfml.cpp
index 8e7939cd9..08b231ccb 100644
--- a/src/eepp/window/backend/SFML/cinputsfml.cpp
+++ b/src/eepp/window/backend/SFML/inputsfml.cpp
@@ -1,9 +1,9 @@
-#include <eepp/window/backend/SFML/cinputsfml.hpp>
-#include <eepp/window/backend/SFML/cjoystickmanagersfml.hpp>
+#include <eepp/window/backend/SFML/inputsfml.hpp>
+#include <eepp/window/backend/SFML/joystickmanagersfml.hpp>
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
-#include <eepp/window/backend/SFML/cwindowsfml.hpp>
+#include <eepp/window/backend/SFML/windowsfml.hpp>
 #include <SFML/Window.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SFML {
diff --git a/src/eepp/window/backend/SFML/cinputsfml.hpp b/src/eepp/window/backend/SFML/inputsfml.hpp
similarity index 95%
rename from src/eepp/window/backend/SFML/cinputsfml.hpp
rename to src/eepp/window/backend/SFML/inputsfml.hpp
index 2abb9064b..6bebd002b 100644
--- a/src/eepp/window/backend/SFML/cinputsfml.hpp
+++ b/src/eepp/window/backend/SFML/inputsfml.hpp
@@ -3,7 +3,7 @@
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
-#include <eepp/window/cinput.hpp>
+#include <eepp/window/input.hpp>
 #ifdef None
 #undef None
 #endif
diff --git a/src/eepp/window/backend/SFML/cjoystickmanagersfml.cpp b/src/eepp/window/backend/SFML/joystickmanagersfml.cpp
similarity index 86%
rename from src/eepp/window/backend/SFML/cjoystickmanagersfml.cpp
rename to src/eepp/window/backend/SFML/joystickmanagersfml.cpp
index 85fc632f4..86c67eb85 100644
--- a/src/eepp/window/backend/SFML/cjoystickmanagersfml.cpp
+++ b/src/eepp/window/backend/SFML/joystickmanagersfml.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/backend/SFML/cjoystickmanagersfml.hpp>
-#include <eepp/window/backend/SFML/cjoysticksfml.hpp>
+#include <eepp/window/backend/SFML/joystickmanagersfml.hpp>
+#include <eepp/window/backend/SFML/joysticksfml.hpp>
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
diff --git a/src/eepp/window/backend/SFML/cjoystickmanagersfml.hpp b/src/eepp/window/backend/SFML/joystickmanagersfml.hpp
similarity index 91%
rename from src/eepp/window/backend/SFML/cjoystickmanagersfml.hpp
rename to src/eepp/window/backend/SFML/joystickmanagersfml.hpp
index 725d4f8ef..4bae5286a 100644
--- a/src/eepp/window/backend/SFML/cjoystickmanagersfml.hpp
+++ b/src/eepp/window/backend/SFML/joystickmanagersfml.hpp
@@ -3,7 +3,7 @@
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
-#include <eepp/window/cjoystickmanager.hpp>
+#include <eepp/window/joystickmanager.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SFML {
 
diff --git a/src/eepp/window/backend/SFML/cjoysticksfml.cpp b/src/eepp/window/backend/SFML/joysticksfml.cpp
similarity index 97%
rename from src/eepp/window/backend/SFML/cjoysticksfml.cpp
rename to src/eepp/window/backend/SFML/joysticksfml.cpp
index 05188d69a..b8adbe482 100644
--- a/src/eepp/window/backend/SFML/cjoysticksfml.cpp
+++ b/src/eepp/window/backend/SFML/joysticksfml.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SFML/cjoysticksfml.hpp>
+#include <eepp/window/backend/SFML/joysticksfml.hpp>
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
diff --git a/src/eepp/window/backend/SFML/cjoysticksfml.hpp b/src/eepp/window/backend/SFML/joysticksfml.hpp
similarity index 93%
rename from src/eepp/window/backend/SFML/cjoysticksfml.hpp
rename to src/eepp/window/backend/SFML/joysticksfml.hpp
index a869eee9c..751385d33 100644
--- a/src/eepp/window/backend/SFML/cjoysticksfml.hpp
+++ b/src/eepp/window/backend/SFML/joysticksfml.hpp
@@ -3,7 +3,7 @@
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
-#include <eepp/window/cjoystick.hpp>
+#include <eepp/window/joystick.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace SFML {
 
diff --git a/src/eepp/window/backend/SFML/cwindowsfml.cpp b/src/eepp/window/backend/SFML/windowsfml.cpp
similarity index 96%
rename from src/eepp/window/backend/SFML/cwindowsfml.cpp
rename to src/eepp/window/backend/SFML/windowsfml.cpp
index 6fe315da2..ec5988616 100644
--- a/src/eepp/window/backend/SFML/cwindowsfml.cpp
+++ b/src/eepp/window/backend/SFML/windowsfml.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/SFML/cwindowsfml.hpp>
+#include <eepp/window/backend/SFML/windowsfml.hpp>
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
@@ -9,9 +9,9 @@
 
 #include <SFML/Graphics.hpp>
 
-#include <eepp/window/backend/SFML/cclipboardsfml.hpp>
-#include <eepp/window/backend/SFML/cinputsfml.hpp>
-#include <eepp/window/backend/SFML/ccursormanagersfml.hpp>
+#include <eepp/window/backend/SFML/clipboardsfml.hpp>
+#include <eepp/window/backend/SFML/inputsfml.hpp>
+#include <eepp/window/backend/SFML/cursormanagersfml.hpp>
 #include <eepp/window/platform/platformimpl.hpp>
 
 #include <eepp/graphics/renderer/cgl.hpp>
diff --git a/src/eepp/window/backend/SFML/cwindowsfml.hpp b/src/eepp/window/backend/SFML/windowsfml.hpp
similarity index 97%
rename from src/eepp/window/backend/SFML/cwindowsfml.hpp
rename to src/eepp/window/backend/SFML/windowsfml.hpp
index de2ea72bf..3f554d6b6 100644
--- a/src/eepp/window/backend/SFML/cwindowsfml.hpp
+++ b/src/eepp/window/backend/SFML/windowsfml.hpp
@@ -3,7 +3,7 @@
 
 #ifdef EE_BACKEND_SFML_ACTIVE
 
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/window.hpp>
 
 #ifdef None
 #undef None
diff --git a/src/eepp/window/backend/null/cbackendnull.hpp b/src/eepp/window/backend/null/backendnull.hpp
similarity index 89%
rename from src/eepp/window/backend/null/cbackendnull.hpp
rename to src/eepp/window/backend/null/backendnull.hpp
index ab4c6f747..a40637fbb 100644
--- a/src/eepp/window/backend/null/cbackendnull.hpp
+++ b/src/eepp/window/backend/null/backendnull.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCBACKENDNULL_HPP
 #define EE_WINDOWCBACKENDNULL_HPP
 
-#include <eepp/window/cbackend.hpp>
+#include <eepp/window/backend.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/cclipboardnull.cpp b/src/eepp/window/backend/null/clipboardnull.cpp
similarity index 79%
rename from src/eepp/window/backend/null/cclipboardnull.cpp
rename to src/eepp/window/backend/null/clipboardnull.cpp
index b9d181975..e17b59520 100644
--- a/src/eepp/window/backend/null/cclipboardnull.cpp
+++ b/src/eepp/window/backend/null/clipboardnull.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/backend/null/cclipboardnull.hpp>
-#include <eepp/window/backend/null/cwindownull.hpp>
+#include <eepp/window/backend/null/clipboardnull.hpp>
+#include <eepp/window/backend/null/windownull.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/cclipboardnull.hpp b/src/eepp/window/backend/null/clipboardnull.hpp
similarity index 92%
rename from src/eepp/window/backend/null/cclipboardnull.hpp
rename to src/eepp/window/backend/null/clipboardnull.hpp
index 5145308af..fdec729d3 100644
--- a/src/eepp/window/backend/null/cclipboardnull.hpp
+++ b/src/eepp/window/backend/null/clipboardnull.hpp
@@ -2,7 +2,7 @@
 #define EE_WINDOWCCLIPBOARDNULL_HPP
 
 #include <eepp/window/base.hpp>
-#include <eepp/window/cclipboard.hpp>
+#include <eepp/window/clipboard.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/ccursormanagernull.cpp b/src/eepp/window/backend/null/cursormanagernull.cpp
similarity index 90%
rename from src/eepp/window/backend/null/ccursormanagernull.cpp
rename to src/eepp/window/backend/null/cursormanagernull.cpp
index 1f007fefb..c356f149a 100644
--- a/src/eepp/window/backend/null/ccursormanagernull.cpp
+++ b/src/eepp/window/backend/null/cursormanagernull.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/backend/null/ccursormanagernull.hpp>
-#include <eepp/window/backend/null/ccursornull.hpp>
+#include <eepp/window/backend/null/cursormanagernull.hpp>
+#include <eepp/window/backend/null/cursornull.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/ccursormanagernull.hpp b/src/eepp/window/backend/null/cursormanagernull.hpp
similarity index 94%
rename from src/eepp/window/backend/null/ccursormanagernull.hpp
rename to src/eepp/window/backend/null/cursormanagernull.hpp
index 242945175..ae1f7b358 100644
--- a/src/eepp/window/backend/null/ccursormanagernull.hpp
+++ b/src/eepp/window/backend/null/cursormanagernull.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCCURSORMANAGERNULL_HPP
 #define EE_WINDOWCCURSORMANAGERNULL_HPP
 
-#include <eepp/window/ccursormanager.hpp>
+#include <eepp/window/cursormanager.hpp>
 
 using namespace EE::Window;
 
diff --git a/src/eepp/window/backend/null/ccursornull.cpp b/src/eepp/window/backend/null/cursornull.cpp
similarity index 92%
rename from src/eepp/window/backend/null/ccursornull.cpp
rename to src/eepp/window/backend/null/cursornull.cpp
index e567c548c..d3b7e2738 100644
--- a/src/eepp/window/backend/null/ccursornull.cpp
+++ b/src/eepp/window/backend/null/cursornull.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/null/ccursornull.hpp>
+#include <eepp/window/backend/null/cursornull.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/ccursornull.hpp b/src/eepp/window/backend/null/cursornull.hpp
similarity index 94%
rename from src/eepp/window/backend/null/ccursornull.hpp
rename to src/eepp/window/backend/null/cursornull.hpp
index efa788966..f0958fea6 100644
--- a/src/eepp/window/backend/null/ccursornull.hpp
+++ b/src/eepp/window/backend/null/cursornull.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCCURSORNULL_HPP
 #define EE_WINDOWCCURSORNULL_HPP
 
-#include <eepp/window/ccursor.hpp>
+#include <eepp/window/cursor.hpp>
 
 using namespace EE::Window;
 
diff --git a/src/eepp/window/backend/null/cinputnull.cpp b/src/eepp/window/backend/null/inputnull.cpp
similarity index 79%
rename from src/eepp/window/backend/null/cinputnull.cpp
rename to src/eepp/window/backend/null/inputnull.cpp
index 8323732ed..da494aefe 100644
--- a/src/eepp/window/backend/null/cinputnull.cpp
+++ b/src/eepp/window/backend/null/inputnull.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/backend/null/cinputnull.hpp>
-#include <eepp/window/backend/null/cjoystickmanagernull.hpp>
+#include <eepp/window/backend/null/inputnull.hpp>
+#include <eepp/window/backend/null/joystickmanagernull.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/cinputnull.hpp b/src/eepp/window/backend/null/inputnull.hpp
similarity index 93%
rename from src/eepp/window/backend/null/cinputnull.hpp
rename to src/eepp/window/backend/null/inputnull.hpp
index 9f6c50b24..06c0c4445 100644
--- a/src/eepp/window/backend/null/cinputnull.hpp
+++ b/src/eepp/window/backend/null/inputnull.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCINPUTNULL_HPP 
 #define EE_WINDOWCINPUTNULL_HPP
 
-#include <eepp/window/cinput.hpp>
+#include <eepp/window/input.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/cjoystickmanagernull.cpp b/src/eepp/window/backend/null/joystickmanagernull.cpp
similarity index 76%
rename from src/eepp/window/backend/null/cjoystickmanagernull.cpp
rename to src/eepp/window/backend/null/joystickmanagernull.cpp
index 959e4dc06..a5e64962e 100644
--- a/src/eepp/window/backend/null/cjoystickmanagernull.cpp
+++ b/src/eepp/window/backend/null/joystickmanagernull.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/backend/null/cjoystickmanagernull.hpp>
-#include <eepp/window/backend/null/cjoysticknull.hpp>
+#include <eepp/window/backend/null/joystickmanagernull.hpp>
+#include <eepp/window/backend/null/joysticknull.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/cjoystickmanagernull.hpp b/src/eepp/window/backend/null/joystickmanagernull.hpp
similarity index 90%
rename from src/eepp/window/backend/null/cjoystickmanagernull.hpp
rename to src/eepp/window/backend/null/joystickmanagernull.hpp
index 8922143ac..b5fdee54f 100644
--- a/src/eepp/window/backend/null/cjoystickmanagernull.hpp
+++ b/src/eepp/window/backend/null/joystickmanagernull.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCJOYSTICKMANAGERNULL_HPP
 #define EE_WINDOWCJOYSTICKMANAGERNULL_HPP
 
-#include <eepp/window/cjoystickmanager.hpp>
+#include <eepp/window/joystickmanager.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/cjoysticknull.cpp b/src/eepp/window/backend/null/joysticknull.cpp
similarity index 91%
rename from src/eepp/window/backend/null/cjoysticknull.cpp
rename to src/eepp/window/backend/null/joysticknull.cpp
index bb8aeb4ea..dc7e12560 100644
--- a/src/eepp/window/backend/null/cjoysticknull.cpp
+++ b/src/eepp/window/backend/null/joysticknull.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/backend/null/cjoysticknull.hpp>
+#include <eepp/window/backend/null/joysticknull.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/cjoysticknull.hpp b/src/eepp/window/backend/null/joysticknull.hpp
similarity index 93%
rename from src/eepp/window/backend/null/cjoysticknull.hpp
rename to src/eepp/window/backend/null/joysticknull.hpp
index a727f8b76..684b53e6b 100644
--- a/src/eepp/window/backend/null/cjoysticknull.hpp
+++ b/src/eepp/window/backend/null/joysticknull.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCJOYSTICKNULL_HPP
 #define EE_WINDOWCJOYSTICKNULL_HPP
 
-#include <eepp/window/cjoystick.hpp>
+#include <eepp/window/joystick.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/cwindownull.cpp b/src/eepp/window/backend/null/windownull.cpp
similarity index 87%
rename from src/eepp/window/backend/null/cwindownull.cpp
rename to src/eepp/window/backend/null/windownull.cpp
index 3654259c1..e02d684b0 100644
--- a/src/eepp/window/backend/null/cwindownull.cpp
+++ b/src/eepp/window/backend/null/windownull.cpp
@@ -1,7 +1,7 @@
-#include <eepp/window/backend/null/cwindownull.hpp>
-#include <eepp/window/backend/null/cclipboardnull.hpp>
-#include <eepp/window/backend/null/cinputnull.hpp>
-#include <eepp/window/backend/null/ccursormanagernull.hpp>
+#include <eepp/window/backend/null/windownull.hpp>
+#include <eepp/window/backend/null/clipboardnull.hpp>
+#include <eepp/window/backend/null/inputnull.hpp>
+#include <eepp/window/backend/null/cursormanagernull.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/backend/null/cwindownull.hpp b/src/eepp/window/backend/null/windownull.hpp
similarity index 96%
rename from src/eepp/window/backend/null/cwindownull.hpp
rename to src/eepp/window/backend/null/windownull.hpp
index 711868cab..d529d4518 100644
--- a/src/eepp/window/backend/null/cwindownull.hpp
+++ b/src/eepp/window/backend/null/windownull.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCWINDOWNULL_HPP
 #define EE_WINDOWCWINDOWNULL_HPP
 
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/window.hpp>
 
 namespace EE { namespace Window { namespace Backend { namespace Null {
 
diff --git a/src/eepp/window/cclipboard.cpp b/src/eepp/window/clipboard.cpp
similarity index 85%
rename from src/eepp/window/cclipboard.cpp
rename to src/eepp/window/clipboard.cpp
index f8c207260..bab681e71 100644
--- a/src/eepp/window/cclipboard.cpp
+++ b/src/eepp/window/clipboard.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/cclipboard.hpp>
+#include <eepp/window/clipboard.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/src/eepp/window/ccursor.cpp b/src/eepp/window/cursor.cpp
similarity index 97%
rename from src/eepp/window/ccursor.cpp
rename to src/eepp/window/cursor.cpp
index a63a62eb3..f2bcd3b7a 100644
--- a/src/eepp/window/ccursor.cpp
+++ b/src/eepp/window/cursor.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/ccursor.hpp>
+#include <eepp/window/cursor.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/src/eepp/window/ccursormanager.cpp b/src/eepp/window/cursormanager.cpp
similarity index 98%
rename from src/eepp/window/ccursormanager.cpp
rename to src/eepp/window/cursormanager.cpp
index 7b017544e..439df6a3a 100644
--- a/src/eepp/window/ccursormanager.cpp
+++ b/src/eepp/window/cursormanager.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/ccursormanager.hpp>
+#include <eepp/window/cursormanager.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/src/eepp/window/cengine.cpp b/src/eepp/window/engine.cpp
similarity index 97%
rename from src/eepp/window/cengine.cpp
rename to src/eepp/window/engine.cpp
index 880150f2a..766457b06 100755
--- a/src/eepp/window/cengine.cpp
+++ b/src/eepp/window/engine.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/system/packmanager.hpp>
 #include <eepp/system/inifile.hpp>
 #include <eepp/graphics/ctexturefactory.hpp>
@@ -13,10 +13,10 @@
 #include <eepp/helper/haikuttf/hkfontmanager.hpp>
 #include <eepp/physics/cphysicsmanager.hpp>
 #include <eepp/network/ssl/sslsocket.hpp>
-#include <eepp/window/cbackend.hpp>
-#include <eepp/window/backend/SDL/cbackendsdl.hpp>
-#include <eepp/window/backend/SDL2/cbackendsdl2.hpp>
-#include <eepp/window/backend/SFML/cbackendsfml.hpp>
+#include <eepp/window/backend.hpp>
+#include <eepp/window/backend/SDL/backendsdl.hpp>
+#include <eepp/window/backend/SDL2/backendsdl2.hpp>
+#include <eepp/window/backend/SFML/backendsfml.hpp>
 #include <eepp/graphics/renderer/cgl.hpp>
 
 #define BACKEND_SDL			1
diff --git a/src/eepp/window/cinput.cpp b/src/eepp/window/input.cpp
similarity index 99%
rename from src/eepp/window/cinput.cpp
rename to src/eepp/window/input.cpp
index 1b1c0e02c..567c625d7 100644
--- a/src/eepp/window/cinput.cpp
+++ b/src/eepp/window/input.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/cinput.hpp>
-#include <eepp/window/cview.hpp>
+#include <eepp/window/input.hpp>
+#include <eepp/window/view.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/src/eepp/window/cinputfinger.cpp b/src/eepp/window/inputfinger.cpp
similarity index 91%
rename from src/eepp/window/cinputfinger.cpp
rename to src/eepp/window/inputfinger.cpp
index 09588a085..20cfac4bc 100644
--- a/src/eepp/window/cinputfinger.cpp
+++ b/src/eepp/window/inputfinger.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/cinputfinger.hpp>
+#include <eepp/window/inputfinger.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/src/eepp/window/cinputtextbuffer.cpp b/src/eepp/window/inputtextbuffer.cpp
similarity index 99%
rename from src/eepp/window/cinputtextbuffer.cpp
rename to src/eepp/window/inputtextbuffer.cpp
index 9603e3e6e..133d742ab 100755
--- a/src/eepp/window/cinputtextbuffer.cpp
+++ b/src/eepp/window/inputtextbuffer.cpp
@@ -1,6 +1,6 @@
-#include <eepp/window/cinputtextbuffer.hpp>
-#include <eepp/window/cengine.hpp>
-#include <eepp/window/cclipboard.hpp>
+#include <eepp/window/inputtextbuffer.hpp>
+#include <eepp/window/engine.hpp>
+#include <eepp/window/clipboard.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/src/eepp/window/cjoystick.cpp b/src/eepp/window/joystick.cpp
similarity index 94%
rename from src/eepp/window/cjoystick.cpp
rename to src/eepp/window/joystick.cpp
index c2170eac0..f47b68758 100644
--- a/src/eepp/window/cjoystick.cpp
+++ b/src/eepp/window/joystick.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/cjoystick.hpp>
-#include <eepp/window/cjoystickmanager.hpp>
+#include <eepp/window/joystick.hpp>
+#include <eepp/window/joystickmanager.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/src/eepp/window/cjoystickmanager.cpp b/src/eepp/window/joystickmanager.cpp
similarity index 93%
rename from src/eepp/window/cjoystickmanager.cpp
rename to src/eepp/window/joystickmanager.cpp
index f8e5ac6cb..6c0fd4169 100644
--- a/src/eepp/window/cjoystickmanager.cpp
+++ b/src/eepp/window/joystickmanager.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/cjoystickmanager.hpp>
+#include <eepp/window/joystickmanager.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/src/eepp/window/platform/null/cnullimpl.cpp b/src/eepp/window/platform/null/nullimpl.cpp
similarity index 96%
rename from src/eepp/window/platform/null/cnullimpl.cpp
rename to src/eepp/window/platform/null/nullimpl.cpp
index efa24c13c..9a73f4fbe 100644
--- a/src/eepp/window/platform/null/cnullimpl.cpp
+++ b/src/eepp/window/platform/null/nullimpl.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/platform/null/cnullimpl.hpp>
+#include <eepp/window/platform/null/nullimpl.hpp>
 
 namespace EE { namespace Window { namespace Platform {
 
diff --git a/src/eepp/window/platform/null/cnullimpl.hpp b/src/eepp/window/platform/null/nullimpl.hpp
similarity index 96%
rename from src/eepp/window/platform/null/cnullimpl.hpp
rename to src/eepp/window/platform/null/nullimpl.hpp
index c91daf3a1..a85ec9bad 100644
--- a/src/eepp/window/platform/null/cnullimpl.hpp
+++ b/src/eepp/window/platform/null/nullimpl.hpp
@@ -2,7 +2,7 @@
 #define EE_WINDOWcNullImpl_HPP
 
 #include <eepp/window/base.hpp>
-#include <eepp/window/cplatformimpl.hpp>
+#include <eepp/window/platformimpl.hpp>
 
 namespace EE { namespace Window { namespace Platform {
 
diff --git a/src/eepp/window/platform/osx/cosximpl.cpp b/src/eepp/window/platform/osx/osximpl.cpp
similarity index 96%
rename from src/eepp/window/platform/osx/cosximpl.cpp
rename to src/eepp/window/platform/osx/osximpl.cpp
index 5003ec72b..9d252cd59 100644
--- a/src/eepp/window/platform/osx/cosximpl.cpp
+++ b/src/eepp/window/platform/osx/osximpl.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/platform/osx/cosximpl.hpp>
+#include <eepp/window/platform/osx/osximpl.hpp>
 
 #if EE_PLATFORM == EE_PLATFORM_MACOSX
 
diff --git a/src/eepp/window/platform/osx/cosximpl.hpp b/src/eepp/window/platform/osx/osximpl.hpp
similarity index 96%
rename from src/eepp/window/platform/osx/cosximpl.hpp
rename to src/eepp/window/platform/osx/osximpl.hpp
index 31ee6c2e9..2129454e0 100644
--- a/src/eepp/window/platform/osx/cosximpl.hpp
+++ b/src/eepp/window/platform/osx/osximpl.hpp
@@ -5,7 +5,7 @@
 
 #if EE_PLATFORM == EE_PLATFORM_MACOSX
 
-#include <eepp/window/cplatformimpl.hpp>
+#include <eepp/window/platformimpl.hpp>
 
 namespace EE { namespace Window { namespace Platform {
 
diff --git a/src/eepp/window/platform/platformimpl.hpp b/src/eepp/window/platform/platformimpl.hpp
index 2dbdc8a55..451912424 100644
--- a/src/eepp/window/platform/platformimpl.hpp
+++ b/src/eepp/window/platform/platformimpl.hpp
@@ -4,13 +4,13 @@
 #include <eepp/core.hpp>
 
 #if defined( EE_X11_PLATFORM )
-#include <eepp/window/platform/x11/cx11impl.hpp>
+#include <eepp/window/platform/x11/x11impl.hpp>
 #elif EE_PLATFORM == EE_PLATFORM_WIN
-#include <eepp/window/platform/win/cwinimpl.hpp>
+#include <eepp/window/platform/win/winimpl.hpp>
 #elif EE_PLATFORM == EE_PLATFORM_MACOSX
-#include <eepp/window/platform/osx/cosximpl.hpp>
+#include <eepp/window/platform/osx/osximpl.hpp>
 #else
-#include <eepp/window/platform/null/cnullimpl.hpp>
+#include <eepp/window/platform/null/nullimpl.hpp>
 #endif
 
 #endif
diff --git a/src/eepp/window/platform/win/ccursorwin.cpp b/src/eepp/window/platform/win/cursorwin.cpp
similarity index 97%
rename from src/eepp/window/platform/win/ccursorwin.cpp
rename to src/eepp/window/platform/win/cursorwin.cpp
index 78ec709b6..e22022672 100644
--- a/src/eepp/window/platform/win/ccursorwin.cpp
+++ b/src/eepp/window/platform/win/cursorwin.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/platform/win/ccursorwin.hpp>
+#include <eepp/window/platform/win/cursorwin.hpp>
 
 #if EE_PLATFORM == EE_PLATFORM_WIN
 
@@ -7,8 +7,8 @@
 #endif
 #include <windows.h>
 
-#include <eepp/window/platform/win/cwinimpl.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/platform/win/winimpl.hpp>
+#include <eepp/window/window.hpp>
 
 #define WINDOWS_RGB(r,g,b)  ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16)))
 
diff --git a/src/eepp/window/platform/win/ccursorwin.hpp b/src/eepp/window/platform/win/cursorwin.hpp
similarity index 95%
rename from src/eepp/window/platform/win/ccursorwin.hpp
rename to src/eepp/window/platform/win/cursorwin.hpp
index 4e52e672f..3accaaea6 100644
--- a/src/eepp/window/platform/win/ccursorwin.hpp
+++ b/src/eepp/window/platform/win/cursorwin.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCCURSORWIN_HPP
 #define EE_WINDOWCCURSORWIN_HPP
 
-#include <eepp/window/ccursor.hpp>
+#include <eepp/window/cursor.hpp>
 
 #if EE_PLATFORM == EE_PLATFORM_WIN
 
diff --git a/src/eepp/window/platform/win/cwinimpl.cpp b/src/eepp/window/platform/win/winimpl.cpp
similarity index 97%
rename from src/eepp/window/platform/win/cwinimpl.cpp
rename to src/eepp/window/platform/win/winimpl.cpp
index 74dd36536..dda6c9d75 100644
--- a/src/eepp/window/platform/win/cwinimpl.cpp
+++ b/src/eepp/window/platform/win/winimpl.cpp
@@ -15,9 +15,9 @@ static BOOL WIN_ShowWindow( HWND hWnd, int nCmdShow ) {
 	return ShowWindow( hWnd, nCmdShow );
 }
 
-#include <eepp/window/platform/win/cwinimpl.hpp>
-#include <eepp/window/cwindow.hpp>
-#include <eepp/window/platform/win/ccursorwin.hpp>
+#include <eepp/window/platform/win/winimpl.hpp>
+#include <eepp/window/window.hpp>
+#include <eepp/window/platform/win/cursorwin.hpp>
 
 namespace EE { namespace Window { namespace Platform {
 
diff --git a/src/eepp/window/platform/win/cwinimpl.hpp b/src/eepp/window/platform/win/winimpl.hpp
similarity index 96%
rename from src/eepp/window/platform/win/cwinimpl.hpp
rename to src/eepp/window/platform/win/winimpl.hpp
index ea626f965..beafdacd0 100644
--- a/src/eepp/window/platform/win/cwinimpl.hpp
+++ b/src/eepp/window/platform/win/winimpl.hpp
@@ -5,7 +5,7 @@
 
 #if EE_PLATFORM == EE_PLATFORM_WIN
 
-#include <eepp/window/cplatformimpl.hpp>
+#include <eepp/window/platformimpl.hpp>
 
 namespace EE { namespace Window { namespace Platform {
 
diff --git a/src/eepp/window/platform/x11/ccursorx11.cpp b/src/eepp/window/platform/x11/cursorx11.cpp
similarity index 93%
rename from src/eepp/window/platform/x11/ccursorx11.cpp
rename to src/eepp/window/platform/x11/cursorx11.cpp
index 2f4414114..ccccaf9ee 100644
--- a/src/eepp/window/platform/x11/ccursorx11.cpp
+++ b/src/eepp/window/platform/x11/cursorx11.cpp
@@ -9,9 +9,9 @@
 #undef Display
 #undef Cursor
 
-#include <eepp/window/platform/x11/ccursorx11.hpp>
-#include <eepp/window/platform/x11/cx11impl.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/platform/x11/cursorx11.hpp>
+#include <eepp/window/platform/x11/x11impl.hpp>
+#include <eepp/window/window.hpp>
 
 namespace EE { namespace Window { namespace Platform {
 
diff --git a/src/eepp/window/platform/x11/ccursorx11.hpp b/src/eepp/window/platform/x11/cursorx11.hpp
similarity index 95%
rename from src/eepp/window/platform/x11/ccursorx11.hpp
rename to src/eepp/window/platform/x11/cursorx11.hpp
index 4e3c85e5c..a6ff8a9b6 100644
--- a/src/eepp/window/platform/x11/ccursorx11.hpp
+++ b/src/eepp/window/platform/x11/cursorx11.hpp
@@ -1,7 +1,7 @@
 #ifndef EE_WINDOWCCURSORX11_HPP
 #define EE_WINDOWCCURSORX11_HPP
 
-#include <eepp/window/ccursor.hpp>
+#include <eepp/window/cursor.hpp>
 
 #if defined( EE_X11_PLATFORM )
 
diff --git a/src/eepp/window/platform/x11/cx11impl.cpp b/src/eepp/window/platform/x11/x11impl.cpp
similarity index 98%
rename from src/eepp/window/platform/x11/cx11impl.cpp
rename to src/eepp/window/platform/x11/x11impl.cpp
index e80621adf..2428e9582 100644
--- a/src/eepp/window/platform/x11/cx11impl.cpp
+++ b/src/eepp/window/platform/x11/x11impl.cpp
@@ -11,8 +11,8 @@
 #undef Cursor
 #define XAtom(str) XInternAtom( mDisplay, str, False )
 
-#include <eepp/window/platform/x11/cx11impl.hpp>
-#include <eepp/window/platform/x11/ccursorx11.hpp>
+#include <eepp/window/platform/x11/x11impl.hpp>
+#include <eepp/window/platform/x11/cursorx11.hpp>
 
 namespace EE { namespace Window { namespace Platform {
 
diff --git a/src/eepp/window/platform/x11/cx11impl.hpp b/src/eepp/window/platform/x11/x11impl.hpp
similarity index 97%
rename from src/eepp/window/platform/x11/cx11impl.hpp
rename to src/eepp/window/platform/x11/x11impl.hpp
index 7ffada0b1..c59a7dba3 100644
--- a/src/eepp/window/platform/x11/cx11impl.hpp
+++ b/src/eepp/window/platform/x11/x11impl.hpp
@@ -5,7 +5,7 @@
 
 #if defined( EE_X11_PLATFORM )
 
-#include <eepp/window/cplatformimpl.hpp>
+#include <eepp/window/platformimpl.hpp>
 
 namespace EE { namespace Window { namespace Platform {
 
diff --git a/src/eepp/window/cplatformimpl.cpp b/src/eepp/window/platformimpl.cpp
similarity index 70%
rename from src/eepp/window/cplatformimpl.cpp
rename to src/eepp/window/platformimpl.cpp
index 6c6b28082..c3e0b7f6b 100644
--- a/src/eepp/window/cplatformimpl.cpp
+++ b/src/eepp/window/platformimpl.cpp
@@ -1,5 +1,5 @@
-#include <eepp/window/cplatformimpl.hpp>
-#include <eepp/window/cwindow.hpp>
+#include <eepp/window/platformimpl.hpp>
+#include <eepp/window/window.hpp>
 
 namespace EE { namespace Window { namespace Platform {
 
diff --git a/src/eepp/window/cview.cpp b/src/eepp/window/view.cpp
similarity index 98%
rename from src/eepp/window/cview.cpp
rename to src/eepp/window/view.cpp
index d438189a7..8e01be32e 100755
--- a/src/eepp/window/cview.cpp
+++ b/src/eepp/window/view.cpp
@@ -1,4 +1,4 @@
-#include <eepp/window/cview.hpp>
+#include <eepp/window/view.hpp>
 
 namespace EE { namespace Window {
 
diff --git a/src/eepp/window/cwindow.cpp b/src/eepp/window/window.cpp
similarity index 97%
rename from src/eepp/window/cwindow.cpp
rename to src/eepp/window/window.cpp
index e1d423d46..8433e8602 100644
--- a/src/eepp/window/cwindow.cpp
+++ b/src/eepp/window/window.cpp
@@ -1,10 +1,10 @@
-#include <eepp/window/cwindow.hpp>
-#include <eepp/window/cclipboard.hpp>
-#include <eepp/window/cinput.hpp>
-#include <eepp/window/ccursormanager.hpp>
-#include <eepp/window/platform/null/cnullimpl.hpp>
-#include <eepp/window/cplatformimpl.hpp>
-#include <eepp/window/cengine.hpp>
+#include <eepp/window/window.hpp>
+#include <eepp/window/clipboard.hpp>
+#include <eepp/window/input.hpp>
+#include <eepp/window/cursormanager.hpp>
+#include <eepp/window/platform/null/nullimpl.hpp>
+#include <eepp/window/platformimpl.hpp>
+#include <eepp/window/engine.hpp>
 #include <eepp/graphics/glextensions.hpp>
 #include <eepp/graphics/renderer/cgl.hpp>
 #include <eepp/graphics/ctexturefactory.hpp>