diff --git a/src/dorkbox/systemTray/SystemTray.java b/src/dorkbox/systemTray/SystemTray.java
index 3ca2b3b..6b6416a 100644
--- a/src/dorkbox/systemTray/SystemTray.java
+++ b/src/dorkbox/systemTray/SystemTray.java
@@ -47,8 +47,8 @@ import dorkbox.systemTray.nativeUI._AppIndicatorNativeTray;
 import dorkbox.systemTray.nativeUI._AwtTray;
 import dorkbox.systemTray.nativeUI._GtkStatusIconNativeTray;
 import dorkbox.systemTray.swingUI.SwingUI;
-import dorkbox.systemTray.swingUI._AppIndicatorTray;
-import dorkbox.systemTray.swingUI._GtkStatusIconTray;
+import dorkbox.systemTray.swingUI._AppIndicatorSwingTray;
+import dorkbox.systemTray.swingUI._GtkStatusIconSwingTray;
 import dorkbox.systemTray.swingUI._SwingTray;
 import dorkbox.systemTray.util.ImageUtils;
 import dorkbox.systemTray.util.JavaFX;
@@ -195,8 +195,8 @@ class SystemTray {
     private static
     boolean isTrayType(final Class<? extends Tray> tray, final TrayType trayType) {
         switch (trayType) {
-            case GtkStatusIcon: return (tray == _GtkStatusIconTray.class || tray == _GtkStatusIconNativeTray.class);
-            case AppIndicator: return (tray == _AppIndicatorTray.class || tray == _AppIndicatorNativeTray.class);
+            case GtkStatusIcon: return (tray == _GtkStatusIconSwingTray.class || tray == _GtkStatusIconNativeTray.class);
+            case AppIndicator: return (tray == _AppIndicatorSwingTray.class || tray == _AppIndicatorNativeTray.class);
             case Swing: return (tray == _SwingTray.class || tray == _AwtTray.class);
         }
         return false;
@@ -208,14 +208,14 @@ class SystemTray {
             if (useNativeMenus) {
                 return _GtkStatusIconNativeTray.class;
             } else {
-                return _GtkStatusIconTray.class;
+                return _GtkStatusIconSwingTray.class;
             }
         } else if (trayType == TrayType.AppIndicator) {
             if (useNativeMenus) {
                 return _AppIndicatorNativeTray.class;
             }
             else {
-                return _AppIndicatorTray.class;
+                return _AppIndicatorSwingTray.class;
             }
         }
         else if (trayType == TrayType.Swing) {
diff --git a/src/dorkbox/systemTray/swingUI/_AppIndicatorTray.java b/src/dorkbox/systemTray/swingUI/_AppIndicatorSwingTray.java
similarity index 99%
rename from src/dorkbox/systemTray/swingUI/_AppIndicatorTray.java
rename to src/dorkbox/systemTray/swingUI/_AppIndicatorSwingTray.java
index 272a9a1..b981b64 100644
--- a/src/dorkbox/systemTray/swingUI/_AppIndicatorTray.java
+++ b/src/dorkbox/systemTray/swingUI/_AppIndicatorSwingTray.java
@@ -82,7 +82,7 @@ import dorkbox.util.SwingUtil;
  */
 @SuppressWarnings("Duplicates")
 public
-class _AppIndicatorTray extends Tray implements SwingUI {
+class _AppIndicatorSwingTray extends Tray implements SwingUI {
     private volatile AppIndicatorInstanceStruct appIndicator;
     private boolean isActive = false;
     private volatile Runnable popupRunnable;
@@ -110,7 +110,7 @@ class _AppIndicatorTray extends Tray implements SwingUI {
     // trayIcon.setToolTip("app name");
 
     public
-    _AppIndicatorTray(final SystemTray systemTray) {
+    _AppIndicatorSwingTray(final SystemTray systemTray) {
         super();
 
         Gtk.startGui();
diff --git a/src/dorkbox/systemTray/swingUI/_GtkStatusIconTray.java b/src/dorkbox/systemTray/swingUI/_GtkStatusIconSwingTray.java
similarity index 98%
rename from src/dorkbox/systemTray/swingUI/_GtkStatusIconTray.java
rename to src/dorkbox/systemTray/swingUI/_GtkStatusIconSwingTray.java
index 4f2cc5b..a58ba63 100644
--- a/src/dorkbox/systemTray/swingUI/_GtkStatusIconTray.java
+++ b/src/dorkbox/systemTray/swingUI/_GtkStatusIconSwingTray.java
@@ -44,7 +44,7 @@ import dorkbox.util.SwingUtil;
  */
 @SuppressWarnings("Duplicates")
 public
-class _GtkStatusIconTray extends Tray implements SwingUI {
+class _GtkStatusIconSwingTray extends Tray implements SwingUI {
     private volatile Pointer trayIcon;
 
     // have to save these in a field to prevent GC on the objects (since they go out-of-scope from java)
@@ -62,7 +62,7 @@ class _GtkStatusIconTray extends Tray implements SwingUI {
 
     // called on the EDT
     public
-    _GtkStatusIconTray(final SystemTray systemTray) {
+    _GtkStatusIconSwingTray(final SystemTray systemTray) {
         super();
 
         Gtk.startGui();