diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
index 93e5a07e0..5ab752705 100644
--- a/java/src/processing/mode/java/pdex/ASTGenerator.java
+++ b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -3520,18 +3520,17 @@ public class ASTGenerator {
       log("SuggestionsMap is null or empty, won't be able to trim class names");
       return true;
     }
-    final String processingInclude = "include.processing";
-    final String processingExclude = "exclude.processing";
-    final String jdkInclude = "include.jdk";
+    final String include = "include";
+    final String exclude = "exclude";
 
     if (impName.startsWith("processing")) {
-      if (JavaMode.suggestionsMap.get(processingInclude).contains(impName)) {
+      if (JavaMode.suggestionsMap.get(include).contains(impName)) {
         return false;
-      } else if (JavaMode.suggestionsMap.get(processingExclude).contains(impName)) {
+      } else if (JavaMode.suggestionsMap.get(exclude).contains(impName)) {
         return true;
       }
     } else if (impName.startsWith("java")) {
-      if (JavaMode.suggestionsMap.get(jdkInclude).contains(impName)) {
+      if (JavaMode.suggestionsMap.get(include).contains(impName)) {
         return false;
       }
     }
diff --git a/java/suggestions.txt b/java/suggestions.txt
index ff86167a2..ae9f8642e 100644
--- a/java/suggestions.txt
+++ b/java/suggestions.txt
@@ -1,48 +1,48 @@
 #List of suggestions to include/exclude in code completion
 
-#<include/exclude>.<label>=<fully qualified class name>
+#<include/exclude>=<fully qualified class name>
 
-include.processing=processing.core.PApplet
-include.processing=processing.core.PFont
-include.processing=processing.core.PGraphics
-include.processing=processing.core.PImage
-include.processing=processing.core.PMatrix2D
-include.processing=processing.core.PMatrix3D
-include.processing=processing.core.PStyle
-include.processing=processing.core.PVector
-include.processing=processing.core.PShape
-include.processing=processing.core.PGraphicsJava2D
-include.processing=processing.core.PGraphics2D
-include.processing=processing.core.PGraphics3D
-include.processing=processing.data.FloatDict
-include.processing=processing.data.FloatList
-include.processing=processing.data.IntDict
-include.processing=processing.data.IntList
-include.processing=processing.data.JSONArray
-include.processing=processing.data.JSONObject
-include.processing=processing.data.StringDict
-include.processing=processing.data.StringList
-include.processing=processing.data.Table
-include.processing=processing.data.XML
-include.processing=processing.event.Event
-include.processing=processing.event.KeyEvent
-include.processing=processing.event.MouseEvent
-include.processing=processing.event.TouchEvent
-include.processing=processing.opengl.PShader
-include.processing=processing.opengl.PGL
+include=processing.core.PApplet
+include=processing.core.PFont
+include=processing.core.PGraphics
+include=processing.core.PImage
+include=processing.core.PMatrix2D
+include=processing.core.PMatrix3D
+include=processing.core.PStyle
+include=processing.core.PVector
+include=processing.core.PShape
+include=processing.core.PGraphicsJava2D
+include=processing.core.PGraphics2D
+include=processing.core.PGraphics3D
+include=processing.data.FloatDict
+include=processing.data.FloatList
+include=processing.data.IntDict
+include=processing.data.IntList
+include=processing.data.JSONArray
+include=processing.data.JSONObject
+include=processing.data.StringDict
+include=processing.data.StringList
+include=processing.data.Table
+include=processing.data.XML
+include=processing.event.Event
+include=processing.event.KeyEvent
+include=processing.event.MouseEvent
+include=processing.event.TouchEvent
+include=processing.opengl.PShader
+include=processing.opengl.PGL
 
-exclude.processing=processing.core.PGraphicsRetina2D
-exclude.processing=processing.core.PShapeOBJ
-exclude.processing=processing.core.PShapeSVG
-exclude.processing=processing.data.Sort
-exclude.processing=processing.opengl.FrameBuffer
-exclude.processing=processing.opengl.LinePath
-exclude.processing=processing.opengl.LinePath.PathIterator
-exclude.processing=processing.opengl.LineStroker
-exclude.processing=processing.opengl.PGraphicsOpenGL
+exclude=processing.core.PGraphicsRetina2D
+exclude=processing.core.PShapeOBJ
+exclude=processing.core.PShapeSVG
+exclude=processing.data.Sort
+exclude=processing.opengl.FrameBuffer
+exclude=processing.opengl.LinePath
+exclude=processing.opengl.LinePath.PathIterator
+exclude=processing.opengl.LineStroker
+exclude=processing.opengl.PGraphicsOpenGL
 
-include.jdk=java.util.ArrayList
-include.jdk=java.io.BufferedReader
-include.jdk=java.util.HashMap
-include.jdk=java.io.PrintWriter
-include.jdk=java.lang.String
\ No newline at end of file
+include=java.util.ArrayList
+include=java.io.BufferedReader
+include=java.util.HashMap
+include=java.io.PrintWriter
+include=java.lang.String
\ No newline at end of file