diff --git a/src/squeaknim.nim b/src/squeaknim.nim
index cb1a08a..7eb258d 100644
--- a/src/squeaknim.nim
+++ b/src/squeaknim.nim
@@ -84,9 +84,9 @@ template writeExternalLibrary*() =
                  "\tinstanceVariableNames: ''\C" &
                  "\tclassVariableNames: ''\C" &
                  "\tpoolDictionaries: ''\C" &
-                 "\tcategory: '$1'!\C" &
+                 "\tcategory: '$2'!\C" &
                  "!$1 class methodsFor: 'primitives' stamp: 'SqueakNim'!\C",
-      gPrefix & capitalize(dllName))
+      gPrefix & capitalize(dllName), capitalize(dllName))
 
 template writeSmallTalkCode*(filename: string) =
   ## You need to invoke this template to write the produced SmallTalk code to
@@ -190,6 +190,6 @@ macro wrapObject*(typ: stmt): stmt =
     "\t^#(\C" &
     "$3\C" &
     "\t)! !\C" &
-    "$1 defineFields.\C!\C\C") % [name, dllName, fields]
+    "$1 defineFields.\C!\C\C") % [name, capitalize(dllName), fields]
   stCode.add(st)
   result = newStmtList()