diff --git a/src/main/jastadd/Analysis.jrag b/src/main/jastadd/Analysis.jrag
index 1825fbd8d5e8bed940685b8bf7100e4d5609b797..f179478857be13a247dded1c8fbf1cecfa7a2c7c 100644
--- a/src/main/jastadd/Analysis.jrag
+++ b/src/main/jastadd/Analysis.jrag
@@ -105,6 +105,11 @@ aspect ComponentAnalysis {
   //--- isEqual ---
   syn boolean Component.isEqual(Component c) = this.getClass() == c.getClass() && getTypeUse().isEqual(c.getTypeUse());
 
+  /**
+   * TokenComponents may be specialized by NTATokenComponents and vice versa
+   */
+  eq TokenComponent.isEqual(Component c) = (c instanceof TokenComponent) && getTypeUse().isEqual(c.getTypeUse());
+
   syn boolean TypeUse.isEqual(TypeUse u);
   eq SimpleTypeUse.isEqual(TypeUse u) = u instanceof SimpleTypeUse && getID().equals(u.getID());
   eq ParameterizedTypeUse.isEqual(TypeUse u) {
diff --git a/src/main/jastadd/Backend.jadd b/src/main/jastadd/Backend.jadd
index 26591c03e65af7dd169b1ec4e54bd0798e5d3dc1..cab17e15766bc3323d2cc8b6c1b8f5c3c754c396 100644
--- a/src/main/jastadd/Backend.jadd
+++ b/src/main/jastadd/Backend.jadd
@@ -111,6 +111,9 @@ aspect BackendAbstractGrammar {
   public String TokenComponent.generateAbstractGrammar() {
     return "<" + getID() + ":" + getTypeUse() + ">";
   }
+  public String NTATokenComponent.generateAbstractGrammar() {
+    return "/<" + getID() + ":" + getTypeUse() + ">/";
+  }
 
   public String RelationComponent.generateAbstractGrammar() {
     return "<" + getImplAttributeName() + ":" + ofTypeDecl() + ">";
diff --git a/src/main/jastadd/RelAst.ast b/src/main/jastadd/RelAst.ast
index f0132fc4b3a4c32f1e2f49aad19382dc64379dcf..31083b99eda970809f5f61e6e44a8e4fb23d1a68 100644
--- a/src/main/jastadd/RelAst.ast
+++ b/src/main/jastadd/RelAst.ast
@@ -11,6 +11,7 @@ NTAComponent : SimpleTypeComponent;
 NTAOptComponent : SimpleTypeComponent;
 NTAListComponent : SimpleTypeComponent;
 TokenComponent : Component ::= TypeUse;
+NTATokenComponent : TokenComponent ::= TypeUse;
 
 abstract TypeUse ::= <ID>;
 SimpleTypeUse : TypeUse;
diff --git a/src/main/jastadd/RelAst.parser b/src/main/jastadd/RelAst.parser
index 6b138b97d35b76583a3226b376613b8316a95a36..f043efdf14926e4133efd5138ffc9cb11a752b64 100644
--- a/src/main/jastadd/RelAst.parser
+++ b/src/main/jastadd/RelAst.parser
@@ -75,8 +75,8 @@ Component component =
   | SLASH ID COL s_type_use.u SLASH           {: return new NTAComponent(ID, u); :}
   | SLASH s_type_use.u SLASH                  {: return new NTAComponent(u.getID(), u); :}
   // NTA Token (same as NTA)
-  | SLASH LT ID COL s_type_use.u GT SLASH     {: return new NTAComponent(ID, u); :}
-  | SLASH LT s_type_use.u GT SLASH            {: return new NTAComponent(u.getID(), u); :}
+  | SLASH LT ID COL s_type_use.u GT SLASH     {: return new NTATokenComponent(ID, u); :}
+  | SLASH LT s_type_use.u GT SLASH            {: return new NTATokenComponent(u.getID(), u); :}
   // Token
   | LT ID COL type_use.u GT                   {: return new TokenComponent(ID, u); :}
   | LT ID GT                                  {: return new TokenComponent(ID, new SimpleTypeUse("String")); :}