diff --git a/java/src/processing/mode/java/VariableInspector.java b/java/src/processing/mode/java/DebugTray.java
similarity index 99%
rename from java/src/processing/mode/java/VariableInspector.java
rename to java/src/processing/mode/java/DebugTray.java
index 939d83cf6..81cff18cd 100644
--- a/java/src/processing/mode/java/VariableInspector.java
+++ b/java/src/processing/mode/java/DebugTray.java
@@ -45,7 +45,7 @@ import processing.app.Mode;
 import processing.mode.java.debug.VariableNode;
 
 
-public class VariableInspector extends JFrame {
+public class DebugTray extends JFrame {
   /// the root node (invisible)
   protected DefaultMutableTreeNode rootNode;
   
@@ -83,7 +83,7 @@ public class VariableInspector extends JFrame {
   final int VERTICAL_OFFSET = 64;
     
   
-  public VariableInspector(JavaEditor editor) {
+  public DebugTray(JavaEditor editor) {
     this.editor = editor;
     
     setUndecorated(true);
@@ -573,7 +573,7 @@ public class VariableInspector extends JFrame {
   }
 
     
-  protected static void run(final VariableInspector vi) {
+  protected static void run(final DebugTray vi) {
     EventQueue.invokeLater(new Runnable() {
       @Override
       public void run() {
diff --git a/java/src/processing/mode/java/Debugger.java b/java/src/processing/mode/java/Debugger.java
index 188806a4d..ff26722bf 100644
--- a/java/src/processing/mode/java/Debugger.java
+++ b/java/src/processing/mode/java/Debugger.java
@@ -883,7 +883,7 @@ public class Debugger implements VMEventListener {
         // TODO: needs to be handled in a better way:
         log(Level.WARNING, "call stack empty");
       } else {
-        final VariableInspector vi = editor.variableInspector();
+        final DebugTray vi = editor.variableInspector();
         // first get data
         final List<DefaultMutableTreeNode> stackTrace = getStackTrace(t);
         final List<VariableNode> locals = getLocals(t, 0);
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index a901619e0..db10afa4a 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -56,7 +56,7 @@ public class JavaEditor extends Editor {
 
     jmode = (JavaMode) mode;
     dbg = new Debugger(this);
-    vi = new VariableInspector(this);
+    vi = new DebugTray(this);
 
     // access to customized (i.e. subclassed) text area
     ta = (JavaTextArea) textarea;
@@ -1191,7 +1191,7 @@ public class JavaEditor extends Editor {
   protected JMenuItem toggleVariableInspectorMenuItem;
 
   protected Debugger dbg; // the debugger
-  protected VariableInspector vi; // the variable inspector frame
+  protected DebugTray vi; // the variable inspector frame
 
   public JavaTextArea ta; // the text area
   public ErrorBar errorBar;
@@ -1990,7 +1990,7 @@ public class JavaEditor extends Editor {
      *
      * @return the variable inspector object
      */
-    public VariableInspector variableInspector() {
+    public DebugTray variableInspector() {
         return vi;
     }