diff --git a/src/main/java/net/rptools/maptool/client/AppActions.java b/src/main/java/net/rptools/maptool/client/AppActions.java
index 0f2fc95053..c49300c1b7 100644
--- a/src/main/java/net/rptools/maptool/client/AppActions.java
+++ b/src/main/java/net/rptools/maptool/client/AppActions.java
@@ -141,7 +141,7 @@ private static int getMenuShortcutKeyMask() {
   public static final Action NEXT_TOKEN =
       new ZoneClientAction() {
         {
-          init("menu.nextToken");
+          init("action.nextToken");
         }
 
         @Override
diff --git a/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelTreeModel.java b/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelTreeModel.java
index 296bf97335..b0c4c3747c 100644
--- a/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelTreeModel.java
+++ b/src/main/java/net/rptools/maptool/client/ui/drawpanel/DrawPanelTreeModel.java
@@ -29,7 +29,6 @@
 import javax.swing.tree.TreePath;
 import net.rptools.maptool.client.MapTool;
 import net.rptools.maptool.events.MapToolEventBus;
-import net.rptools.maptool.language.I18N;
 import net.rptools.maptool.model.Zone;
 import net.rptools.maptool.model.drawing.AbstractTemplate;
 import net.rptools.maptool.model.drawing.DrawablesGroup;
@@ -56,18 +55,12 @@ public static View getByLayer(Zone.Layer layer) {
       return byLayer.get(layer);
     }
 
-    private final String displayName;
     private final Zone.Layer layer;
 
     private View(Zone.Layer layer) {
-      this.displayName = I18N.getText("panel.DrawExplorer.View." + layer.name());
       this.layer = layer;
     }
 
-    public String getDisplayName() {
-      return displayName;
-    }
-
     public Zone.Layer getLayer() {
       return layer;
     }
diff --git a/src/main/resources/net/rptools/maptool/language/i18n.properties b/src/main/resources/net/rptools/maptool/language/i18n.properties
index 40c87ecf2a..85c0802e53 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n.properties
@@ -1248,6 +1248,7 @@ action.commandPanel                           = Command Panel
 # In order to prevent I18N from warning that they don't exist these
 # lines have been added.
 action.commitCommand                          = Not used (action.commitCommand)
+action.newlineCommand                         = Not used (action.newlineCommand)
 action.copyTokens                             = Copy
 action.copyTokens.accel                       = C
 action.copyTokens.description                 = Copy selected tokens to an internal clipboard.
@@ -1420,6 +1421,7 @@ action.saveMapAs                              = &Export Map...
 action.saveMapAs.description                  = Save a map to an external file.
 action.saveMessageHistory                     = Save Chat Log &History...
 action.saveMessageHistory.description         = Save the contents of your chat log, including whispers.
+action.nextToken                              = Select next token
 # Tool
 action.sendChat                               = C&hat
 action.sendChat.accel                         = ENTER