diff --git a/Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon.cpp b/Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.cpp
similarity index 97%
rename from Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon.cpp
rename to Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.cpp
index 8dc89e9616..6e5758fb1f 100644
--- a/Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon.cpp
+++ b/Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.cpp
@@ -3,10 +3,10 @@
  * Copyright 2008-2014 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the GNU Lesser General Public License.
  */
+#include "Polygon2d.h"
 #include <cmath>
 #include <iostream>
 #include <SFML/System/Vector2.hpp>
-#include "GDCore/BuiltinExtensions/SpriteExtension/Polygon.h"
 
 void Polygon2d::Rotate(float angle)
 {
diff --git a/Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon.h b/Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.h
similarity index 100%
rename from Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon.h
rename to Core/GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.h
diff --git a/Core/GDCore/BuiltinExtensions/SpriteExtension/Sprite.cpp b/Core/GDCore/BuiltinExtensions/SpriteExtension/Sprite.cpp
index 1d1937dd14..deef6eb282 100644
--- a/Core/GDCore/BuiltinExtensions/SpriteExtension/Sprite.cpp
+++ b/Core/GDCore/BuiltinExtensions/SpriteExtension/Sprite.cpp
@@ -3,7 +3,7 @@
  * Copyright 2008-2014 Florian Rival (Florian.Rival@gmail.com). All rights reserved.
  * This project is released under the GNU Lesser General Public License.
  */
-#include "GDCore/BuiltinExtensions/SpriteExtension/Polygon.h"
+#include "GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.h"
 #include "GDCore/BuiltinExtensions/SpriteExtension/Sprite.h"
 #include "GDCore/PlatformDefinition/ImageManager.h"
 #include <SFML/Graphics/Sprite.hpp>
@@ -149,4 +149,4 @@ void Sprite::MakeSpriteOwnsItsImage()
 }
 #endif
 
-}
\ No newline at end of file
+}
diff --git a/Core/GDCore/BuiltinExtensions/SpriteExtension/Sprite.h b/Core/GDCore/BuiltinExtensions/SpriteExtension/Sprite.h
index 70ac3c347a..9adfade993 100644
--- a/Core/GDCore/BuiltinExtensions/SpriteExtension/Sprite.h
+++ b/Core/GDCore/BuiltinExtensions/SpriteExtension/Sprite.h
@@ -10,7 +10,7 @@
 #include <boost/shared_ptr.hpp>
 #include <SFML/Graphics/Sprite.hpp>
 #include "GDCore/BuiltinExtensions/SpriteExtension/Point.h"
-#include "GDCore/BuiltinExtensions/SpriteExtension/Polygon.h"
+#include "GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.h"
 class SFMLTextureWrapper;
 #undef LoadImage //prevent windows.h to be polluting everything
 
@@ -202,4 +202,4 @@ private:
 
 
 }
-#endif // SPRITE_H
\ No newline at end of file
+#endif // SPRITE_H
diff --git a/Extensions/Box3DObject/Box3DObject.cpp b/Extensions/Box3DObject/Box3DObject.cpp
index 44808db58f..459b33cc45 100644
--- a/Extensions/Box3DObject/Box3DObject.cpp
+++ b/Extensions/Box3DObject/Box3DObject.cpp
@@ -38,7 +38,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/ImageManager.h"
 #include "GDCpp/FontManager.h"
 #include "GDCpp/Position.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCore/Serialization/SerializerElement.h"
 
 #if defined(GD_IDE_ONLY)
diff --git a/Extensions/Light/LightObject.cpp b/Extensions/Light/LightObject.cpp
index 55796c6ef1..26908dba5b 100644
--- a/Extensions/Light/LightObject.cpp
+++ b/Extensions/Light/LightObject.cpp
@@ -34,7 +34,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/Serialization/SerializerElement.h"
 #include "GDCpp/FontManager.h"
 #include "GDCpp/Position.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/CommonTools.h"
 #include "LightObject.h"
 #include "LightManager.h"
diff --git a/Extensions/PanelSpriteObject/PanelSpriteObject.cpp b/Extensions/PanelSpriteObject/PanelSpriteObject.cpp
index 76671e1745..d34552e0f5 100644
--- a/Extensions/PanelSpriteObject/PanelSpriteObject.cpp
+++ b/Extensions/PanelSpriteObject/PanelSpriteObject.cpp
@@ -37,7 +37,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/RuntimeGame.h"
 #include "GDCpp/Project.h"
 #include "GDCpp/Position.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/Serialization/SerializerElement.h"
 #include "GDCpp/CommonTools.h"
 
diff --git a/Extensions/ParticleSystem/ParticleEmitterObject.cpp b/Extensions/ParticleSystem/ParticleEmitterObject.cpp
index e7d771b49e..47216f5858 100644
--- a/Extensions/ParticleSystem/ParticleEmitterObject.cpp
+++ b/Extensions/ParticleSystem/ParticleEmitterObject.cpp
@@ -38,7 +38,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/Serialization/SerializerElement.h"
 #include "GDCpp/RuntimeScene.h"
 #include "GDCpp/Project.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/CommonTools.h"
 #include "ParticleEmitterObject.h"
 #include "ParticleSystemWrapper.h"
diff --git a/Extensions/PrimitiveDrawing/DrawerObject.cpp b/Extensions/PrimitiveDrawing/DrawerObject.cpp
index 020b481c98..6d8fd5f9b5 100644
--- a/Extensions/PrimitiveDrawing/DrawerObject.cpp
+++ b/Extensions/PrimitiveDrawing/DrawerObject.cpp
@@ -33,7 +33,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/RuntimeScene.h"
 #include "GDCpp/Project.h"
 #include "GDCpp/ImageManager.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/Serialization/SerializerElement.h"
 #include "GDCpp/FontManager.h"
 #include "GDCpp/Position.h"
diff --git a/Extensions/TextObject/TextObject.cpp b/Extensions/TextObject/TextObject.cpp
index 1a6e0687d5..8432bfbeb4 100644
--- a/Extensions/TextObject/TextObject.cpp
+++ b/Extensions/TextObject/TextObject.cpp
@@ -34,7 +34,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/Serialization/SerializerElement.h"
 #include "GDCpp/FontManager.h"
 #include "GDCpp/Position.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/CommonTools.h"
 #include "GDCpp/Serialization/SerializerElement.h"
 #include "TextObject.h"
diff --git a/Extensions/TileMapObject/RuntimeTileMapObject.cpp b/Extensions/TileMapObject/RuntimeTileMapObject.cpp
index 2a11544922..87757332f0 100644
--- a/Extensions/TileMapObject/RuntimeTileMapObject.cpp
+++ b/Extensions/TileMapObject/RuntimeTileMapObject.cpp
@@ -35,7 +35,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/ImageManager.h"
 #include "GDCpp/FontManager.h"
 #include "GDCpp/Position.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/PolygonCollision.h"
 #include "GDCpp/BuiltinExtensions/ObjectTools.h"
 #include "GDCpp/Serialization/SerializerElement.h"
@@ -93,9 +93,9 @@ bool RuntimeTileMapObject::Draw( sf::RenderTarget& window )
 
     //Construct the transform
     sf::Transform transform;
-    transform.translate((int)GetX() + centerPos.x - floor(centerPos.x), 
+    transform.translate((int)GetX() + centerPos.x - floor(centerPos.x),
                         (int)GetY() + centerPos.y - floor(centerPos.y));
-    
+
     //Unsmooth the texture
     bool wasSmooth = tileSet.Get().GetTexture().isSmooth();
     tileSet.Get().GetTexture().setSmooth(false);
diff --git a/Extensions/TileMapObject/RuntimeTileMapObject.h b/Extensions/TileMapObject/RuntimeTileMapObject.h
index 9775a03099..e7ea55f49d 100644
--- a/Extensions/TileMapObject/RuntimeTileMapObject.h
+++ b/Extensions/TileMapObject/RuntimeTileMapObject.h
@@ -31,7 +31,7 @@ freely, subject to the following restrictions:
 
 #include "GDCpp/Object.h"
 #include "GDCpp/RuntimeObject.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include <boost/shared_ptr.hpp>
 #include <SFML/Graphics/VertexArray.hpp>
 
diff --git a/Extensions/TileMapObject/TileMapObject.cpp b/Extensions/TileMapObject/TileMapObject.cpp
index 4b4ac8ede2..b6cf2aa157 100644
--- a/Extensions/TileMapObject/TileMapObject.cpp
+++ b/Extensions/TileMapObject/TileMapObject.cpp
@@ -41,7 +41,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/ImageManager.h"
 #include "GDCpp/FontManager.h"
 #include "GDCpp/Position.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/PolygonCollision.h"
 #include "GDCpp/BuiltinExtensions/ObjectTools.h"
 #include "GDCpp/Serialization/SerializerElement.h"
@@ -135,7 +135,7 @@ void TileMapObject::DrawInitialInstance(gd::InitialInstance & instance, sf::Rend
 
     //Construct the transform
     sf::Transform transform;
-    transform.translate(instance.GetX() + centerPos.x - floor(centerPos.x), 
+    transform.translate(instance.GetX() + centerPos.x - floor(centerPos.x),
                         instance.GetY() + centerPos.y - floor(centerPos.y));
 
     //Unsmooth the texture
diff --git a/Extensions/TileMapObject/TileMapObject.h b/Extensions/TileMapObject/TileMapObject.h
index 2894e12881..cdf69247ee 100644
--- a/Extensions/TileMapObject/TileMapObject.h
+++ b/Extensions/TileMapObject/TileMapObject.h
@@ -28,7 +28,7 @@ freely, subject to the following restrictions:
 #define TILEMAPOBJECT_H
 #include "GDCpp/Object.h"
 #include "GDCpp/RuntimeObject.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include <boost/shared_ptr.hpp>
 #include <SFML/Graphics/VertexArray.hpp>
 
diff --git a/Extensions/TileMapObject/TileMapTools.h b/Extensions/TileMapObject/TileMapTools.h
index 33397ae78f..729074f0cf 100644
--- a/Extensions/TileMapObject/TileMapTools.h
+++ b/Extensions/TileMapObject/TileMapTools.h
@@ -29,7 +29,7 @@ freely, subject to the following restrictions:
 
 #include <vector>
 #include <SFML/Graphics.hpp>
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 
 class TileSet;
 class TileMap;
@@ -40,4 +40,4 @@ namespace TileMapExtension
 	std::vector<Polygon2d> GenerateHitboxes(TileSet &tileSet, TileMap &tileMap);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Extensions/TileMapObject/TileSet.h b/Extensions/TileMapObject/TileSet.h
index 3c53328973..b4dadb8d66 100644
--- a/Extensions/TileMapObject/TileSet.h
+++ b/Extensions/TileMapObject/TileSet.h
@@ -37,7 +37,7 @@ freely, subject to the following restrictions:
 #include "GDCore/PlatformDefinition/ImageManager.h"
 #include "GDCore/PlatformDefinition/Project.h"
 #include "GDCore/Serialization/SerializerElement.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/RuntimeGame.h"
 
 /**
diff --git a/Extensions/TiledSpriteObject/TiledSpriteObject.cpp b/Extensions/TiledSpriteObject/TiledSpriteObject.cpp
index 8199b694e5..e480c964f6 100644
--- a/Extensions/TiledSpriteObject/TiledSpriteObject.cpp
+++ b/Extensions/TiledSpriteObject/TiledSpriteObject.cpp
@@ -39,7 +39,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/ImageManager.h"
 #include "GDCpp/FontManager.h"
 #include "GDCpp/Position.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/Serialization/SerializerElement.h"
 #include "GDCpp/CommonTools.h"
 
diff --git a/Extensions/VideoObject/VideoObject.cpp b/Extensions/VideoObject/VideoObject.cpp
index 1390884e03..ee25370371 100644
--- a/Extensions/VideoObject/VideoObject.cpp
+++ b/Extensions/VideoObject/VideoObject.cpp
@@ -34,7 +34,7 @@ freely, subject to the following restrictions:
 #include "GDCpp/Serialization/SerializerElement.h"
 #include "GDCpp/FontManager.h"
 #include "GDCpp/Position.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/CommonTools.h"
 #include "VideoObject.h"
 
diff --git a/GDCpp/GDCpp/BuiltinExtensions/ObjectTools.cpp b/GDCpp/GDCpp/BuiltinExtensions/ObjectTools.cpp
index 0f94f44d55..99bc1642d2 100644
--- a/GDCpp/GDCpp/BuiltinExtensions/ObjectTools.cpp
+++ b/GDCpp/GDCpp/BuiltinExtensions/ObjectTools.cpp
@@ -1,6 +1,6 @@
 #include "ObjectTools.h"
 #include "GDCpp/RuntimeObject.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCpp/PolygonCollision.h"
 #include "MathematicalTools.h"
 #include <cmath>
@@ -221,4 +221,4 @@ static bool MovesTowardInnerTest(RuntimeObject * obj1, RuntimeObject * obj2, con
 bool GD_API MovesToward( std::map <std::string, std::vector<RuntimeObject*> *> objectsLists1, std::map <std::string, std::vector<RuntimeObject*> *> objectsLists2, float tolerance, bool conditionInverted )
 {
     return TwoObjectListsTest(objectsLists1, objectsLists2, conditionInverted, MovesTowardInnerTest, ToleranceExtraParameter(tolerance));
-}
\ No newline at end of file
+}
diff --git a/GDCpp/GDCpp/Polygon.cpp b/GDCpp/GDCpp/Polygon2d.cpp
similarity index 100%
rename from GDCpp/GDCpp/Polygon.cpp
rename to GDCpp/GDCpp/Polygon2d.cpp
diff --git a/GDCpp/GDCpp/Polygon.h b/GDCpp/GDCpp/Polygon2d.h
similarity index 73%
rename from GDCpp/GDCpp/Polygon.h
rename to GDCpp/GDCpp/Polygon2d.h
index 6a109fe580..09760179f0 100644
--- a/GDCpp/GDCpp/Polygon.h
+++ b/GDCpp/GDCpp/Polygon2d.h
@@ -4,4 +4,4 @@
  * This project is released under the GNU Lesser General Public License.
  */
 
-#include "GDCore/BuiltinExtensions/SpriteExtension/Polygon.h"
\ No newline at end of file
+#include "GDCore/BuiltinExtensions/SpriteExtension/Polygon2d.h"
diff --git a/GDCpp/GDCpp/PolygonCollision.cpp b/GDCpp/GDCpp/PolygonCollision.cpp
index 91a4c252cb..51e5be5a23 100644
--- a/GDCpp/GDCpp/PolygonCollision.cpp
+++ b/GDCpp/GDCpp/PolygonCollision.cpp
@@ -4,7 +4,7 @@
  * This project is released under the GNU Lesser General Public License.
  */
 #include "GDCpp/PolygonCollision.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include <cmath>
 #include <cfloat>
 
diff --git a/GDCpp/GDCpp/RuntimeObject.cpp b/GDCpp/GDCpp/RuntimeObject.cpp
index 6677bbeb7b..1c2d65ec55 100644
--- a/GDCpp/GDCpp/RuntimeObject.cpp
+++ b/GDCpp/GDCpp/RuntimeObject.cpp
@@ -12,7 +12,7 @@
 #include "GDCpp/CommonTools.h"
 #include "GDCpp/RuntimeScene.h"
 #include "GDCpp/PolygonCollision.h"
-#include "GDCpp/Polygon.h"
+#include "GDCpp/Polygon2d.h"
 #include "GDCore/CommonTools.h"
 #include <SFML/System.hpp>
 #include <iostream>
@@ -639,4 +639,4 @@ void DestroyBaseRuntimeObject(RuntimeObject * object)
 RuntimeObject * CreateBaseRuntimeObject(RuntimeScene & scene, const gd::Object & object)
 {
     return new RuntimeObject(scene, object);
-}
\ No newline at end of file
+}