diff --git a/Source/Libs/CairSharp/Antialias.cs b/Source/Libs/CairoSharp/Antialias.cs
similarity index 100%
rename from Source/Libs/CairSharp/Antialias.cs
rename to Source/Libs/CairoSharp/Antialias.cs
diff --git a/Source/Libs/CairSharp/Cairo.cs b/Source/Libs/CairoSharp/Cairo.cs
similarity index 100%
rename from Source/Libs/CairSharp/Cairo.cs
rename to Source/Libs/CairoSharp/Cairo.cs
diff --git a/Source/Libs/CairSharp/CairoDebug.cs b/Source/Libs/CairoSharp/CairoDebug.cs
similarity index 100%
rename from Source/Libs/CairSharp/CairoDebug.cs
rename to Source/Libs/CairoSharp/CairoDebug.cs
diff --git a/Source/Libs/CairSharp/CairSharp-api.xml b/Source/Libs/CairoSharp/CairoSharp-api.xml
similarity index 100%
rename from Source/Libs/CairSharp/CairSharp-api.xml
rename to Source/Libs/CairoSharp/CairoSharp-api.xml
diff --git a/Source/Libs/CairSharp/CairSharp.csproj b/Source/Libs/CairoSharp/CairoSharp.csproj
similarity index 100%
rename from Source/Libs/CairSharp/CairSharp.csproj
rename to Source/Libs/CairoSharp/CairoSharp.csproj
diff --git a/Source/Libs/CairSharp/Color.cs b/Source/Libs/CairoSharp/Color.cs
similarity index 100%
rename from Source/Libs/CairSharp/Color.cs
rename to Source/Libs/CairoSharp/Color.cs
diff --git a/Source/Libs/CairSharp/Content.cs b/Source/Libs/CairoSharp/Content.cs
similarity index 100%
rename from Source/Libs/CairSharp/Content.cs
rename to Source/Libs/CairoSharp/Content.cs
diff --git a/Source/Libs/CairSharp/Context.cs b/Source/Libs/CairoSharp/Context.cs
similarity index 100%
rename from Source/Libs/CairSharp/Context.cs
rename to Source/Libs/CairoSharp/Context.cs
diff --git a/Source/Libs/CairSharp/Device.cs b/Source/Libs/CairoSharp/Device.cs
similarity index 100%
rename from Source/Libs/CairSharp/Device.cs
rename to Source/Libs/CairoSharp/Device.cs
diff --git a/Source/Libs/CairSharp/DirectFBSurface.cs b/Source/Libs/CairoSharp/DirectFBSurface.cs
similarity index 100%
rename from Source/Libs/CairSharp/DirectFBSurface.cs
rename to Source/Libs/CairoSharp/DirectFBSurface.cs
diff --git a/Source/Libs/CairSharp/Distance.cs b/Source/Libs/CairoSharp/Distance.cs
similarity index 100%
rename from Source/Libs/CairSharp/Distance.cs
rename to Source/Libs/CairoSharp/Distance.cs
diff --git a/Source/Libs/CairSharp/Extend.cs b/Source/Libs/CairoSharp/Extend.cs
similarity index 100%
rename from Source/Libs/CairSharp/Extend.cs
rename to Source/Libs/CairoSharp/Extend.cs
diff --git a/Source/Libs/CairSharp/FillRule.cs b/Source/Libs/CairoSharp/FillRule.cs
similarity index 100%
rename from Source/Libs/CairSharp/FillRule.cs
rename to Source/Libs/CairoSharp/FillRule.cs
diff --git a/Source/Libs/CairSharp/Filter.cs b/Source/Libs/CairoSharp/Filter.cs
similarity index 100%
rename from Source/Libs/CairSharp/Filter.cs
rename to Source/Libs/CairoSharp/Filter.cs
diff --git a/Source/Libs/CairSharp/FontExtents.cs b/Source/Libs/CairoSharp/FontExtents.cs
similarity index 100%
rename from Source/Libs/CairSharp/FontExtents.cs
rename to Source/Libs/CairoSharp/FontExtents.cs
diff --git a/Source/Libs/CairSharp/FontFace.cs b/Source/Libs/CairoSharp/FontFace.cs
similarity index 100%
rename from Source/Libs/CairSharp/FontFace.cs
rename to Source/Libs/CairoSharp/FontFace.cs
diff --git a/Source/Libs/CairSharp/FontOptions.cs b/Source/Libs/CairoSharp/FontOptions.cs
similarity index 100%
rename from Source/Libs/CairSharp/FontOptions.cs
rename to Source/Libs/CairoSharp/FontOptions.cs
diff --git a/Source/Libs/CairSharp/FontSlant.cs b/Source/Libs/CairoSharp/FontSlant.cs
similarity index 100%
rename from Source/Libs/CairSharp/FontSlant.cs
rename to Source/Libs/CairoSharp/FontSlant.cs
diff --git a/Source/Libs/CairSharp/FontType.cs b/Source/Libs/CairoSharp/FontType.cs
similarity index 100%
rename from Source/Libs/CairSharp/FontType.cs
rename to Source/Libs/CairoSharp/FontType.cs
diff --git a/Source/Libs/CairSharp/FontWeight.cs b/Source/Libs/CairoSharp/FontWeight.cs
similarity index 100%
rename from Source/Libs/CairSharp/FontWeight.cs
rename to Source/Libs/CairoSharp/FontWeight.cs
diff --git a/Source/Libs/CairSharp/Format.cs b/Source/Libs/CairoSharp/Format.cs
similarity index 100%
rename from Source/Libs/CairSharp/Format.cs
rename to Source/Libs/CairoSharp/Format.cs
diff --git a/Source/Libs/CairSharp/GlitzSurface.cs b/Source/Libs/CairoSharp/GlitzSurface.cs
similarity index 100%
rename from Source/Libs/CairSharp/GlitzSurface.cs
rename to Source/Libs/CairoSharp/GlitzSurface.cs
diff --git a/Source/Libs/CairSharp/Glyph.cs b/Source/Libs/CairoSharp/Glyph.cs
similarity index 100%
rename from Source/Libs/CairSharp/Glyph.cs
rename to Source/Libs/CairoSharp/Glyph.cs
diff --git a/Source/Libs/CairSharp/Gradient.cs b/Source/Libs/CairoSharp/Gradient.cs
similarity index 100%
rename from Source/Libs/CairSharp/Gradient.cs
rename to Source/Libs/CairoSharp/Gradient.cs
diff --git a/Source/Libs/CairSharp/HintMetrics.cs b/Source/Libs/CairoSharp/HintMetrics.cs
similarity index 100%
rename from Source/Libs/CairSharp/HintMetrics.cs
rename to Source/Libs/CairoSharp/HintMetrics.cs
diff --git a/Source/Libs/CairSharp/HintStyle.cs b/Source/Libs/CairoSharp/HintStyle.cs
similarity index 100%
rename from Source/Libs/CairSharp/HintStyle.cs
rename to Source/Libs/CairoSharp/HintStyle.cs
diff --git a/Source/Libs/CairSharp/ImageSurface.cs b/Source/Libs/CairoSharp/ImageSurface.cs
similarity index 100%
rename from Source/Libs/CairSharp/ImageSurface.cs
rename to Source/Libs/CairoSharp/ImageSurface.cs
diff --git a/Source/Libs/CairSharp/LineCap.cs b/Source/Libs/CairoSharp/LineCap.cs
similarity index 100%
rename from Source/Libs/CairSharp/LineCap.cs
rename to Source/Libs/CairoSharp/LineCap.cs
diff --git a/Source/Libs/CairSharp/LineJoin.cs b/Source/Libs/CairoSharp/LineJoin.cs
similarity index 100%
rename from Source/Libs/CairSharp/LineJoin.cs
rename to Source/Libs/CairoSharp/LineJoin.cs
diff --git a/Source/Libs/CairSharp/LinearGradient.cs b/Source/Libs/CairoSharp/LinearGradient.cs
similarity index 100%
rename from Source/Libs/CairSharp/LinearGradient.cs
rename to Source/Libs/CairoSharp/LinearGradient.cs
diff --git a/Source/Libs/CairSharp/Matrix.cs b/Source/Libs/CairoSharp/Matrix.cs
similarity index 100%
rename from Source/Libs/CairSharp/Matrix.cs
rename to Source/Libs/CairoSharp/Matrix.cs
diff --git a/Source/Libs/CairSharp/NativeMethods.cs b/Source/Libs/CairoSharp/NativeMethods.cs
similarity index 100%
rename from Source/Libs/CairSharp/NativeMethods.cs
rename to Source/Libs/CairoSharp/NativeMethods.cs
diff --git a/Source/Libs/CairSharp/Operator.cs b/Source/Libs/CairoSharp/Operator.cs
similarity index 100%
rename from Source/Libs/CairSharp/Operator.cs
rename to Source/Libs/CairoSharp/Operator.cs
diff --git a/Source/Libs/CairSharp/PSSurface.cs b/Source/Libs/CairoSharp/PSSurface.cs
similarity index 100%
rename from Source/Libs/CairSharp/PSSurface.cs
rename to Source/Libs/CairoSharp/PSSurface.cs
diff --git a/Source/Libs/CairSharp/Path.cs b/Source/Libs/CairoSharp/Path.cs
similarity index 100%
rename from Source/Libs/CairSharp/Path.cs
rename to Source/Libs/CairoSharp/Path.cs
diff --git a/Source/Libs/CairSharp/Pattern.cs b/Source/Libs/CairoSharp/Pattern.cs
similarity index 100%
rename from Source/Libs/CairSharp/Pattern.cs
rename to Source/Libs/CairoSharp/Pattern.cs
diff --git a/Source/Libs/CairSharp/PatternType.cs b/Source/Libs/CairoSharp/PatternType.cs
similarity index 100%
rename from Source/Libs/CairSharp/PatternType.cs
rename to Source/Libs/CairoSharp/PatternType.cs
diff --git a/Source/Libs/CairSharp/PdfSurface.cs b/Source/Libs/CairoSharp/PdfSurface.cs
similarity index 100%
rename from Source/Libs/CairSharp/PdfSurface.cs
rename to Source/Libs/CairoSharp/PdfSurface.cs
diff --git a/Source/Libs/CairSharp/Point.cs b/Source/Libs/CairoSharp/Point.cs
similarity index 100%
rename from Source/Libs/CairSharp/Point.cs
rename to Source/Libs/CairoSharp/Point.cs
diff --git a/Source/Libs/CairSharp/PointD.cs b/Source/Libs/CairoSharp/PointD.cs
similarity index 100%
rename from Source/Libs/CairSharp/PointD.cs
rename to Source/Libs/CairoSharp/PointD.cs
diff --git a/Source/Libs/CairSharp/RadialGradient.cs b/Source/Libs/CairoSharp/RadialGradient.cs
similarity index 100%
rename from Source/Libs/CairSharp/RadialGradient.cs
rename to Source/Libs/CairoSharp/RadialGradient.cs
diff --git a/Source/Libs/CairSharp/Rectangle.cs b/Source/Libs/CairoSharp/Rectangle.cs
similarity index 100%
rename from Source/Libs/CairSharp/Rectangle.cs
rename to Source/Libs/CairoSharp/Rectangle.cs
diff --git a/Source/Libs/CairSharp/Region.cs b/Source/Libs/CairoSharp/Region.cs
similarity index 100%
rename from Source/Libs/CairSharp/Region.cs
rename to Source/Libs/CairoSharp/Region.cs
diff --git a/Source/Libs/CairSharp/ScaledFont.cs b/Source/Libs/CairoSharp/ScaledFont.cs
similarity index 100%
rename from Source/Libs/CairSharp/ScaledFont.cs
rename to Source/Libs/CairoSharp/ScaledFont.cs
diff --git a/Source/Libs/CairSharp/SolidPattern.cs b/Source/Libs/CairoSharp/SolidPattern.cs
similarity index 100%
rename from Source/Libs/CairSharp/SolidPattern.cs
rename to Source/Libs/CairoSharp/SolidPattern.cs
diff --git a/Source/Libs/CairSharp/Status.cs b/Source/Libs/CairoSharp/Status.cs
similarity index 100%
rename from Source/Libs/CairSharp/Status.cs
rename to Source/Libs/CairoSharp/Status.cs
diff --git a/Source/Libs/CairSharp/SubpixelOrder.cs b/Source/Libs/CairoSharp/SubpixelOrder.cs
similarity index 100%
rename from Source/Libs/CairSharp/SubpixelOrder.cs
rename to Source/Libs/CairoSharp/SubpixelOrder.cs
diff --git a/Source/Libs/CairSharp/Surface.cs b/Source/Libs/CairoSharp/Surface.cs
similarity index 100%
rename from Source/Libs/CairSharp/Surface.cs
rename to Source/Libs/CairoSharp/Surface.cs
diff --git a/Source/Libs/CairSharp/SurfacePattern.cs b/Source/Libs/CairoSharp/SurfacePattern.cs
similarity index 100%
rename from Source/Libs/CairSharp/SurfacePattern.cs
rename to Source/Libs/CairoSharp/SurfacePattern.cs
diff --git a/Source/Libs/CairSharp/SurfaceType.cs b/Source/Libs/CairoSharp/SurfaceType.cs
similarity index 100%
rename from Source/Libs/CairSharp/SurfaceType.cs
rename to Source/Libs/CairoSharp/SurfaceType.cs
diff --git a/Source/Libs/CairSharp/SvgSurface.cs b/Source/Libs/CairoSharp/SvgSurface.cs
similarity index 100%
rename from Source/Libs/CairSharp/SvgSurface.cs
rename to Source/Libs/CairoSharp/SvgSurface.cs
diff --git a/Source/Libs/CairSharp/SvgVersion.cs b/Source/Libs/CairoSharp/SvgVersion.cs
similarity index 100%
rename from Source/Libs/CairSharp/SvgVersion.cs
rename to Source/Libs/CairoSharp/SvgVersion.cs
diff --git a/Source/Libs/CairSharp/TextExtents.cs b/Source/Libs/CairoSharp/TextExtents.cs
similarity index 100%
rename from Source/Libs/CairSharp/TextExtents.cs
rename to Source/Libs/CairoSharp/TextExtents.cs
diff --git a/Source/Libs/CairSharp/Win32Surface.cs b/Source/Libs/CairoSharp/Win32Surface.cs
similarity index 100%
rename from Source/Libs/CairSharp/Win32Surface.cs
rename to Source/Libs/CairoSharp/Win32Surface.cs
diff --git a/Source/Libs/CairSharp/XcbSurface.cs b/Source/Libs/CairoSharp/XcbSurface.cs
similarity index 100%
rename from Source/Libs/CairSharp/XcbSurface.cs
rename to Source/Libs/CairoSharp/XcbSurface.cs
diff --git a/Source/Libs/CairSharp/XlibSurface.cs b/Source/Libs/CairoSharp/XlibSurface.cs
similarity index 100%
rename from Source/Libs/CairSharp/XlibSurface.cs
rename to Source/Libs/CairoSharp/XlibSurface.cs
diff --git a/Source/Libs/CairSharp/linux-x64/libcairo-2.so b/Source/Libs/CairoSharp/linux-x64/libcairo-2.so
similarity index 100%
rename from Source/Libs/CairSharp/linux-x64/libcairo-2.so
rename to Source/Libs/CairoSharp/linux-x64/libcairo-2.so
diff --git a/Source/Libs/CairSharp/linux-x86/libcairo-2.so b/Source/Libs/CairoSharp/linux-x86/libcairo-2.so
similarity index 100%
rename from Source/Libs/CairSharp/linux-x86/libcairo-2.so
rename to Source/Libs/CairoSharp/linux-x86/libcairo-2.so
diff --git a/Source/Libs/GdkSharp/GdkSharp.csproj b/Source/Libs/GdkSharp/GdkSharp.csproj
index aecc28d82..26a1d950c 100755
--- a/Source/Libs/GdkSharp/GdkSharp.csproj
+++ b/Source/Libs/GdkSharp/GdkSharp.csproj
@@ -17,8 +17,8 @@
     <ProjectReference Include="..\GioSharp\GioSharp.csproj">
       <Name>GioSharp</Name>
     </ProjectReference>
-    <ProjectReference Include="..\CairSharp\CairSharp.csproj">
-      <Name>CairSharp</Name>
+    <ProjectReference Include="..\CairSharp\CairoSharp.csproj">
+      <Name>CairoSharp</Name>
     </ProjectReference>
     <ProjectReference Include="..\PangoSharp\PangoSharp.csproj">
       <Name>PangoSharp</Name>
diff --git a/Source/Libs/GLibSharp.sln b/Source/Libs/GtkSharp.sln
similarity index 98%
rename from Source/Libs/GLibSharp.sln
rename to Source/Libs/GtkSharp.sln
index 68eb461dc..a287dddc7 100755
--- a/Source/Libs/GLibSharp.sln
+++ b/Source/Libs/GtkSharp.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GLibSharp", "GLibSharp\GLib
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GioSharp", "GioSharp\GioSharp.csproj", "{25C49839-7DA6-45BA-849A-C6D4B8FAFA31}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CairSharp", "CairSharp\CairSharp.csproj", "{23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CairoSharp", "CairoSharp\CairoSharp.csproj", "{23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PangoSharp", "PangoSharp\PangoSharp.csproj", "{B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}"
 EndProject
diff --git a/Source/Libs/GtkSharp/GtkSharp.csproj b/Source/Libs/GtkSharp/GtkSharp.csproj
index d5fa825ac..6fa0b3708 100755
--- a/Source/Libs/GtkSharp/GtkSharp.csproj
+++ b/Source/Libs/GtkSharp/GtkSharp.csproj
@@ -24,8 +24,8 @@
     <ProjectReference Include="..\GdkSharp\GdkSharp.csproj">
       <Name>GdkSharp</Name>
     </ProjectReference>
-    <ProjectReference Include="..\CairSharp\CairSharp.csproj">
-      <Name>CairSharp</Name>
+    <ProjectReference Include="..\CairSharp\CairoSharp.csproj">
+      <Name>CairoSharp</Name>
     </ProjectReference>
     <ProjectReference Include="..\PangoSharp\PangoSharp.csproj">
       <Name>PangoSharp</Name>
diff --git a/Source/Libs/PangoSharp/PangoSharp.csproj b/Source/Libs/PangoSharp/PangoSharp.csproj
index 4ace3133f..6ff090b83 100755
--- a/Source/Libs/PangoSharp/PangoSharp.csproj
+++ b/Source/Libs/PangoSharp/PangoSharp.csproj
@@ -14,8 +14,8 @@
     <ProjectReference Include="..\GLibSharp\GLibSharp.csproj">
       <Name>GLibSharp</Name>
     </ProjectReference>
-    <ProjectReference Include="..\CairSharp\CairSharp.csproj">
-      <Name>CairSharp</Name>
+    <ProjectReference Include="..\CairoSharp\CairoSharp.csproj">
+      <Name>CairoSharp</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/build.cake b/build.cake
index af3a7d784..bc8306d52 100755
--- a/build.cake
+++ b/build.cake
@@ -32,18 +32,18 @@ var glist = new List<GAssembly>()
         NativeDeps = new[] { "libatk-1.0.so.0", "libatk-1.0-0" },
         ExtraArgs = "--abi-cs-usings=Atk,GLib"
     },
-    new GAssembly("CairSharp")
+    new GAssembly("CairoSharp")
     {
         NativeDeps = new[] { "libcairo.so.2", "libcairo-2" }
     },
     new GAssembly("PangoSharp")
     {
-        Deps = new[] { "GLibSharp", "CairSharp" },
+        Deps = new[] { "GLibSharp", "CairoSharp" },
         NativeDeps = new[] { "libpango-1.0.so.0", "libpango-1.0-0" }
     },
     new GAssembly("GdkSharp")
     {
-        Deps = new[] { "GLibSharp", "GioSharp", "CairSharp", "PangoSharp" },
+        Deps = new[] { "GLibSharp", "GioSharp", "CairoSharp", "PangoSharp" },
         NativeDeps = new[] {
             "libgdk-3.so.0", "libgdk-3-0",
             "libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0-0"
@@ -51,7 +51,7 @@ var glist = new List<GAssembly>()
     },
     new GAssembly("GtkSharp")
     {
-        Deps = new[] { "GLibSharp", "GioSharp", "AtkSharp", "CairSharp", "PangoSharp", "GdkSharp" },
+        Deps = new[] { "GLibSharp", "GioSharp", "AtkSharp", "CairoSharp", "PangoSharp", "GdkSharp" },
         NativeDeps = new[] { "libgtk-3.so.0", "libgtk-3-0" },
         ExtraArgs = "--abi-cs-usings=Gtk,GLib"
     }
@@ -86,7 +86,7 @@ Task("Prepare")
     // Generate code and prepare libs projects
     foreach(var gassembly in list)
         gassembly.Prepare();
-    DotNetCoreRestore("Source/Libs/GLibSharp.sln");
+    DotNetCoreRestore("Source/Libs/GtkSharp.sln");
 });
 
 Task("GenerateLinuxStubs")
@@ -126,7 +126,7 @@ Task("Build")
     };
 
     if (list.Count == glist.Count)
-        DotNetCoreBuild("Source/Libs/GLibSharp.sln", settings);
+        DotNetCoreBuild("Source/Libs/GtkSharp.sln", settings);
     else
     {
         foreach(var gassembly in list)