diff --git a/source/gtd/GirPackage.d b/source/gtd/GirPackage.d
index b12c9d5..5e50a06 100644
--- a/source/gtd/GirPackage.d
+++ b/source/gtd/GirPackage.d
@@ -455,7 +455,7 @@ final class GirPackage
 		if ( name == "gdk" || name == "pango" )
 			buff ~= "import cairo.c.types;\n";
 
-		buff ~= "import gtkd.Loader;\n\n";
+		buff ~= "import linker.Loader;\n\n";
 		buff ~= getLibraries();
 		buff ~= "\n\nshared static this()\n{";
 
diff --git a/source/gtd/GirStruct.d b/source/gtd/GirStruct.d
index 6d1ab7c..98e648c 100644
--- a/source/gtd/GirStruct.d
+++ b/source/gtd/GirStruct.d
@@ -434,7 +434,7 @@ final class GirStruct
 					buff ~= indenter.format("{");
 
 					if ( wrapper.useRuntimeLinker )
-						buff ~= indenter.format("if ( Linker.isLoaded(LIBRARY_"~ pack.name.replace(".","").toUpper() ~") && ownedRef )");
+						buff ~= indenter.format("if ( Linker.isLoaded(LIBRARY_"~ pack.name.replace(".","").toUpper() ~"[0]) && ownedRef )");
 					else
 						buff ~= indenter.format("if ( ownedRef )");
 
@@ -452,7 +452,7 @@ final class GirStruct
 					buff ~= indenter.format("{");
 
 					if ( wrapper.useRuntimeLinker )
-						buff ~= indenter.format("if ( Linker.isLoaded(LIBRARY_"~ pack.name.replace(".","").toUpper() ~") && ownedRef )");
+						buff ~= indenter.format("if ( Linker.isLoaded(LIBRARY_"~ pack.name.replace(".","").toUpper() ~"[0]) && ownedRef )");
 					else
 						buff ~= indenter.format("if ( ownedRef )");
 
@@ -901,7 +901,7 @@ final class GirStruct
 			imports ~= "glib.MemorySlice";
 
 		if ( wrapper.useRuntimeLinker && (shouldFree() || isSimpleStruct()) )
-			imports ~= "gtkd.Loader";
+			imports ~= "linker.Loader";
 
 		if ( isSimpleStruct() )
 		{