diff --git a/java/src/processing/mode/java/pdex/CompletionCandidate.java b/java/src/processing/mode/java/pdex/CompletionCandidate.java
index ca48ab15d..a8e638745 100644
--- a/java/src/processing/mode/java/pdex/CompletionCandidate.java
+++ b/java/src/processing/mode/java/pdex/CompletionCandidate.java
@@ -96,7 +96,7 @@ public class CompletionCandidate implements Comparable<CompletionCandidate>{
       type = LOCAL_FIELD;
     else
       type = LOCAL_VAR;
-    label = vdf.getName() + " : " + ASTGenerator.extracTypeInfo2(vdf);
+    label = vdf.getName() + " : " + CompletionGenerator.extracTypeInfo2(vdf);
     wrappedObject = vdf;
   }
 
diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/CompletionGenerator.java
similarity index 99%
rename from java/src/processing/mode/java/pdex/ASTGenerator.java
rename to java/src/processing/mode/java/pdex/CompletionGenerator.java
index eefdb5972..364e786fe 100644
--- a/java/src/processing/mode/java/pdex/ASTGenerator.java
+++ b/java/src/processing/mode/java/pdex/CompletionGenerator.java
@@ -66,9 +66,9 @@ import com.google.classpath.ClassPath;
 import com.google.classpath.RegExpResourceFilter;
 
 @SuppressWarnings({ "unchecked" })
-public class ASTGenerator {
+public class CompletionGenerator {
 
-  public ASTGenerator() {
+  public CompletionGenerator() {
     //addCompletionPopupListner();
     //loadJavaDoc();
   }
diff --git a/java/src/processing/mode/java/pdex/JavaTextArea.java b/java/src/processing/mode/java/pdex/JavaTextArea.java
index b1cebfa8e..9ef3f6d2e 100644
--- a/java/src/processing/mode/java/pdex/JavaTextArea.java
+++ b/java/src/processing/mode/java/pdex/JavaTextArea.java
@@ -90,7 +90,7 @@ public class JavaTextArea extends JEditTextArea {
     prevMMotionListeners = painter.getMouseMotionListeners();
     prevKeyListeners = editor.getKeyListeners();
 
-    suggestionGenerator = new ASTGenerator();
+    suggestionGenerator = new CompletionGenerator();
 
     tweakMode = false;
   }
@@ -256,7 +256,7 @@ public class JavaTextArea extends JEditTextArea {
   }
 
 
-  ASTGenerator suggestionGenerator;
+  CompletionGenerator suggestionGenerator;
 
   SwingWorker<Void, Void> suggestionWorker = null;
 
@@ -346,7 +346,7 @@ public class JavaTextArea extends JEditTextArea {
     //        if (showSuggestions && phrase != null &&
             if (candidates != null && !candidates.isEmpty()) {
               Collections.sort(candidates);
-              defListModel = ASTGenerator.filterPredictions(candidates);
+              defListModel = CompletionGenerator.filterPredictions(candidates);
               Messages.log("Got: " + candidates.size() + " candidates, " + defListModel.size() + " filtered");
             }
           }
diff --git a/java/src/processing/mode/java/pdex/PDEX.java b/java/src/processing/mode/java/pdex/PDEX.java
index 43ec20753..f5d60c232 100644
--- a/java/src/processing/mode/java/pdex/PDEX.java
+++ b/java/src/processing/mode/java/pdex/PDEX.java
@@ -703,7 +703,7 @@ public class PDEX {
             Object o = treeNode.getUserObject();
             if (o instanceof ASTNode) {
               ASTNode node = (ASTNode) o;
-              return ASTGenerator.getNodeAsString(node);
+              return CompletionGenerator.getNodeAsString(node);
             }
           }
           return super.convertValueToText(value, selected, expanded, leaf, row, hasFocus);