diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index b8d888b26..15c93b3d8 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -36,7 +36,7 @@ import processing.app.debug.TargetBoard;
 import processing.app.debug.TargetPackage;
 import processing.app.debug.TargetPlatform;
 import processing.app.helpers.FileUtils;
-import processing.app.helpers.GUINotifier;
+import processing.app.helpers.GUIUserNotifier;
 import processing.app.helpers.OSUtils;
 import processing.app.helpers.PreferencesMap;
 import processing.app.helpers.filefilters.OnlyDirs;
@@ -106,7 +106,7 @@ public class Base {
   static public void main(String args[]) throws Exception {
     BaseNoGui.initLogger();
     
-    BaseNoGui.notifier = new GUINotifier();
+    BaseNoGui.notifier = new GUIUserNotifier();
 
     initPlatform();
 
diff --git a/app/src/processing/app/BaseNoGui.java b/app/src/processing/app/BaseNoGui.java
index a12c9f4a7..c51eb7c84 100644
--- a/app/src/processing/app/BaseNoGui.java
+++ b/app/src/processing/app/BaseNoGui.java
@@ -21,7 +21,7 @@ import processing.app.debug.TargetBoard;
 import processing.app.debug.TargetPackage;
 import processing.app.debug.TargetPlatform;
 import processing.app.debug.TargetPlatformException;
-import processing.app.helpers.BasicNotifier;
+import processing.app.helpers.BasicUserNotifier;
 import processing.app.helpers.OSUtils;
 import processing.app.helpers.PreferencesMap;
 import processing.app.helpers.UserNotifier;
@@ -49,7 +49,7 @@ public class BaseNoGui {
   // maps library name to their library folder
   static private LibraryList libraries;
 
-  static UserNotifier notifier = new BasicNotifier();
+  static UserNotifier notifier = new BasicUserNotifier();
 
   static public Map<String, TargetPackage> packages;
 
diff --git a/app/src/processing/app/helpers/BasicNotifier.java b/app/src/processing/app/helpers/BasicUserNotifier.java
similarity index 93%
rename from app/src/processing/app/helpers/BasicNotifier.java
rename to app/src/processing/app/helpers/BasicUserNotifier.java
index 3abb5d7d5..2f344280d 100644
--- a/app/src/processing/app/helpers/BasicNotifier.java
+++ b/app/src/processing/app/helpers/BasicUserNotifier.java
@@ -2,7 +2,7 @@ package processing.app.helpers;
 
 import static processing.app.I18n._;
 
-public class BasicNotifier implements UserNotifier {
+public class BasicUserNotifier implements UserNotifier {
 
   public void showError(String title, String message, Throwable e) {
     showError(title, message, e, 1);
diff --git a/app/src/processing/app/helpers/GUINotifier.java b/app/src/processing/app/helpers/GUIUserNotifier.java
similarity index 95%
rename from app/src/processing/app/helpers/GUINotifier.java
rename to app/src/processing/app/helpers/GUIUserNotifier.java
index 0aea8d216..144d095d0 100644
--- a/app/src/processing/app/helpers/GUINotifier.java
+++ b/app/src/processing/app/helpers/GUIUserNotifier.java
@@ -6,7 +6,7 @@ import java.awt.Frame;
 
 import javax.swing.JOptionPane;
 
-public class GUINotifier implements UserNotifier {
+public class GUIUserNotifier implements UserNotifier {
 
   public void showError(String title, String message, Throwable e) {
     showError(title, message, e, 1);