diff --git a/src/main/java/org/sablecc/sablecc/AddAstProductions.java b/src/main/java/org/sablecc/sablecc/AddAstProductions.java
index 43adccb5e736e571c75a4b3e61e20556a927f2fa..b5c9e6a42a1dc2461d4c650d7484568e48b0ca77 100644
--- a/src/main/java/org/sablecc/sablecc/AddAstProductions.java
+++ b/src/main/java/org/sablecc/sablecc/AddAstProductions.java
@@ -26,7 +26,7 @@ import java.io.*;
 public class AddAstProductions extends DepthFirstAdapter
 {
 
-  List<AAstProd> listAstProd = new LinkedList<>();
+  List<PAstProd> listAstProd = new LinkedList<>();
   private boolean firstAlt;
 
   public AddAstProductions()
@@ -95,8 +95,8 @@ public class AddAstProductions extends DepthFirstAdapter
     }
   }
 
-  List<AElem> listElems;
-  List<AAstAlt> listOfAstAlts;
+  List<PElem> listElems;
+  List<PAstAlt> listOfAstAlts;
 
   public void error(Token token)
   {
diff --git a/src/main/java/org/sablecc/sablecc/Inlining.java b/src/main/java/org/sablecc/sablecc/Inlining.java
index 12ac9038d0ce3c20fce70ca3e8474b19dac03ef7..a6b0a7852c0afba1ff5db3883a38627e53f9a357 100644
--- a/src/main/java/org/sablecc/sablecc/Inlining.java
+++ b/src/main/java/org/sablecc/sablecc/Inlining.java
@@ -79,7 +79,7 @@ public class Inlining
       Once we detect that the production can be inline,
       we try to inline each of its alternatives.
        */
-      List<AAlt> listOfAlts = new LinkedList<>();
+      List<PAlt> listOfAlts = new LinkedList<>();
       for(int i=0; i<alts.length; i++)
       {
         listOfAlts.addAll( inlineAlternative(alts[i]) );
@@ -107,7 +107,7 @@ public class Inlining
     return false;
   }
 
-  List<AAlt> removeAlternativeDoubloonsFromInlinedProduction(List<AAlt> inlinedAlternatives)
+  List<PAlt> removeAlternativeDoubloonsFromInlinedProduction(List<PAlt> inlinedAlternatives)
   {
     AAlt[] alts = inlinedAlternatives.toArray(new AAlt[0]);
     List<?>[] theWhole = new List<?>[alts.length];