diff --git a/CakeScripts/GAssembly.cs b/CakeScripts/GAssembly.cs
index eb31dd349..29c6a4eb0 100755
--- a/CakeScripts/GAssembly.cs
+++ b/CakeScripts/GAssembly.cs
@@ -29,21 +29,21 @@ public class GAssembly
 
         var temppath = P.Combine(Dir, name);
         Csproj = temppath + ".csproj";
-        RawApi = temppath + "-api.raw";
+        RawApi = temppath + "-api.xml";
         Metadata = temppath + ".metadata";
     }
 
     public void Prepare()
     {
         Cake.CreateDirectory(GDir);
+        var tempapi = P.Combine(GDir, Name + "-api.xml");
+        Cake.CopyFile(RawApi, tempapi);
 
-        // Raw API file found, time to generate some stuff!!!
-        if (Cake.FileExists(RawApi))
+        // Metadata file found, time to generate some stuff!!!
+        if (Cake.FileExists(Metadata))
         {
             // Fixup API file
-            var tempapi = P.Combine(GDir, Name + "-api.xml");
             var symfile = P.Combine(Dir, Name + "-symbols.xml");
-            Cake.CopyFile(RawApi, tempapi);
             Cake.DotNetCoreExecute("BuildOutput/Tools/GapiFixup.dll", 
                 "--metadata=" + Metadata + " " + "--api=" + tempapi + 
                 (Cake.FileExists(symfile) ? " --symbols=" + symfile : string.Empty)
@@ -54,10 +54,7 @@ public class GAssembly
             // Locate APIs to include
             foreach(var dep in Deps)
             {
-                var ipath = P.Combine("Source", "Libs", dep, dep + "-api.xml");
-
-                if (!Cake.FileExists(ipath))
-                    ipath = P.Combine("Source", "Libs", dep, "Generated", dep + "-api.xml");
+                var ipath = P.Combine("Source", "Libs", dep, "Generated", dep + "-api.xml");
 
                 if (Cake.FileExists(ipath))
                     extraargs += " --include=" + ipath + " ";
diff --git a/Source/Libs/AtkSharp/AtkSharp-api.raw b/Source/Libs/AtkSharp/AtkSharp-api.xml
similarity index 100%
rename from Source/Libs/AtkSharp/AtkSharp-api.raw
rename to Source/Libs/AtkSharp/AtkSharp-api.xml
diff --git a/Source/Libs/GdkSharp/GdkSharp-api.raw b/Source/Libs/GdkSharp/GdkSharp-api.xml
similarity index 100%
rename from Source/Libs/GdkSharp/GdkSharp-api.raw
rename to Source/Libs/GdkSharp/GdkSharp-api.xml
diff --git a/Source/Libs/GioSharp/GioSharp-api.raw b/Source/Libs/GioSharp/GioSharp-api.xml
similarity index 100%
rename from Source/Libs/GioSharp/GioSharp-api.raw
rename to Source/Libs/GioSharp/GioSharp-api.xml
diff --git a/Source/Libs/GtkSharp/GtkSharp-api.raw b/Source/Libs/GtkSharp/GtkSharp-api.xml
similarity index 100%
rename from Source/Libs/GtkSharp/GtkSharp-api.raw
rename to Source/Libs/GtkSharp/GtkSharp-api.xml
diff --git a/Source/Libs/PangoSharp/PangoSharp-api.raw b/Source/Libs/PangoSharp/PangoSharp-api.xml
similarity index 100%
rename from Source/Libs/PangoSharp/PangoSharp-api.raw
rename to Source/Libs/PangoSharp/PangoSharp-api.xml