diff --git a/src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java b/src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java
index 41e525d22071ce5ba261c752203979f98be107a7..7741f2c0122ccc66f3b42135fabf8161e941ebf9 100644
--- a/src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java
+++ b/src/main/java/org/sablecc/sablecc/ConstructParserGenerationDatas.java
@@ -19,9 +19,9 @@ public class ConstructParserGenerationDatas extends DepthFirstAdapter
   private boolean processingAst;
   private String currentProd;
 
-  private Map<String, Node> alts;
+  private Map<String, AAlt> alts;
 
-  public ConstructParserGenerationDatas(ResolveIds ids, Map<String, Node> alts)
+  public ConstructParserGenerationDatas(ResolveIds ids, Map<String, AAlt> alts)
   {
     this.ids = ids;
     this.alts = alts;
diff --git a/src/main/java/org/sablecc/sablecc/GenParser.java b/src/main/java/org/sablecc/sablecc/GenParser.java
index 7799a6f8d877c7a79119d39bf1861ea3775afcc1..ba7d077181ec9039f1ddfc380ec69c6d5c099398 100644
--- a/src/main/java/org/sablecc/sablecc/GenParser.java
+++ b/src/main/java/org/sablecc/sablecc/GenParser.java
@@ -81,7 +81,7 @@ public class GenParser extends DepthFirstAdapter
   //Those transformations was specified by the grammar-writer.
   private final Map<String, List<PElem>> mapProductionTransformations = new HashMap<>();
 
-  private Map<String, Node> alts;
+  private Map<String, AAlt> alts;
 
   public GenParser(ResolveIds ids, ResolveAltIds altIds, ResolveTransformIds transformIds,
                    String firstProductionName, boolean processInlining, boolean prettyPrinting)
@@ -382,7 +382,7 @@ public class GenParser extends DepthFirstAdapter
                        "" + productions[i].index,
                        productions[i].name});
 
-        final Node node = alts.get(productions[i].name);
+        final AAlt node = alts.get(productions[i].name);
 
         final BufferedWriter finalFile = file;
         final Deque<Element> stack = new LinkedList<>();
diff --git a/src/main/java/org/sablecc/sablecc/ResolveAstIds.java b/src/main/java/org/sablecc/sablecc/ResolveAstIds.java
index cc98cbf1ee301440d8eb02a2bd0eb8a6ae544ee4..e0a2b1a7c4cd4285c0776633b98667e6210141af 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveAstIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveAstIds.java
@@ -231,7 +231,7 @@ public class ResolveAstIds extends DepthFirstAdapter
                    else
                    {
                      ATokenDef token = astIds.tokens.get("T" + name);
-                     Node ignToken = astIds.ignTokens.get("T" + name);
+                     TId ignToken = astIds.ignTokens.get("T" + name);
                      //Object production = astIds.prods.get("P" + name);
                      AAstProd ast_production = ast_prods.get("P" + name);
                      //if()
diff --git a/src/main/java/org/sablecc/sablecc/ResolveIds.java b/src/main/java/org/sablecc/sablecc/ResolveIds.java
index 6b6c4d0e85518b6efe784971fd514612b8f221ed..c302718455edce33b1bc2658d7ca91be6501d207 100644
--- a/src/main/java/org/sablecc/sablecc/ResolveIds.java
+++ b/src/main/java/org/sablecc/sablecc/ResolveIds.java
@@ -20,9 +20,9 @@ import org.sablecc.sablecc.node.*;
 public class ResolveIds extends DepthFirstAdapter
 {
   public final Map<String, AHelperDef> helpers = new TreeMap<>();
-  public final Map<String, Node> states = new TreeMap<>();
+  public final Map<String, TId> states = new TreeMap<>();
   public final Map<String, ATokenDef> tokens = new TreeMap<>();
-  public final Map<String, Node> ignTokens = new TreeMap<>();
+  public final Map<String, TId> ignTokens = new TreeMap<>();
   public final Map<String, AProd> prods = new TreeMap<>();
 
   public final Map<String, AAlt> alts = new HashMap<>();
@@ -31,8 +31,8 @@ public class ResolveIds extends DepthFirstAdapter
 
   public final Map<Node, String> names = new HashMap<>();
 
-  public final Map<Node, String> errorNames = new HashMap<>();
-  public final Map<Node, String> elemTypes = new HashMap<>();
+  public final Map<ATokenDef, String> errorNames = new HashMap<>();
+  public final Map<AElem, String> elemTypes = new HashMap<>();
 
   public final Map<String, String> altsElemNameTypes = new HashMap<>();