diff --git a/CSharpTranslator/antlr3/src/cs2j/CSharp/TemplateExtracter.g b/CSharpTranslator/antlr3/src/cs2j/CSharp/TemplateExtracter.g
index 75de8d3..1a075a3 100644
--- a/CSharpTranslator/antlr3/src/cs2j/CSharp/TemplateExtracter.g
+++ b/CSharpTranslator/antlr3/src/cs2j/CSharp/TemplateExtracter.g
@@ -115,10 +115,10 @@ scope NSContext;
 }
 :
 	'namespace'   qi=qualified_identifier  
-        { Debug("namespace: " + $qi.text); 
-          $NSContext::nss.Add(new UseRepTemplate($qi.text));
+        { Debug("namespace: " + $qi.thetext); 
+          $NSContext::nss.Add(new UseRepTemplate($qi.thetext));
           // extend parent namespace
-          $NSContext::currentNS = this.ParentNameSpace + $qi.text;
+          $NSContext::currentNS = this.ParentNameSpace + $qi.thetext;
         }  
         namespace_block   ';'? ;
 namespace_block:
@@ -157,8 +157,8 @@ type_declaration:
 	| enum_declaration
 	| delegate_declaration ;
 // Identifiers
-qualified_identifier:
-	^(QID identifier+) ;
+qualified_identifier returns [string thetext]:
+	i1=identifier { $thetext = $i1.text; } ('.' ip=identifier { $thetext += "." + $ip.text; } )*;
 namespace_name
 	: namespace_or_type_name ;
 
diff --git a/CSharpTranslator/antlr3/src/cs2j/CSharp/cs.g b/CSharpTranslator/antlr3/src/cs2j/CSharp/cs.g
index ba8bd6c..bbc0401 100644
--- a/CSharpTranslator/antlr3/src/cs2j/CSharp/cs.g
+++ b/CSharpTranslator/antlr3/src/cs2j/CSharp/cs.g
@@ -6,11 +6,6 @@ options {
     language=CSharp2;
 }
 
-
-tokens {
-	QID;
-}
-
 @namespace { RusticiSoftware.Translator.CSharp }
 
 @lexer::header       
@@ -74,8 +69,7 @@ type_declaration:
 	| delegate_declaration ;
 // Identifiers
 qualified_identifier:
-	identifier ('.' identifier)*  
-	-> ^(QID identifier+) ;
+	identifier ('.' identifier)*;
 namespace_name
 	: namespace_or_type_name ;