diff --git a/CS2JLibrary/NetFramework/System/Array.xml b/CS2JLibrary/NetFramework/System/Array'1.xml
similarity index 100%
rename from CS2JLibrary/NetFramework/System/Array.xml
rename to CS2JLibrary/NetFramework/System/Array'1.xml
diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs
index b9d6984..28b7ebe 100644
--- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs
+++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs
@@ -261,7 +261,8 @@ namespace Twiglet.CS2J.Translator
         {
             Stream s = new FileStream(fullName, FileMode.Open, FileAccess.Read);
             TypeRepTemplate t = TypeRepTemplate.newInstance(s);
-            AppEnv[t.TypeName] = t;
+            // Fullname has form: <path>/<key>.xml
+            AppEnv[t.TypeName+(t.TypeParams != null && t.TypeParams.Length > 0 ? "'" + t.TypeParams.Length.ToString() : "")] = t;
         }
 
         // Here's where we do the real work...