diff --git a/CHANGELOG.md b/CHANGELOG.md
index 277fd73f7..d27d8ff36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@ All notable changes to this project will be documented in this file.
 - [PR190] Collect depth as sprites
 - Updated Dutch translation
 - [#2259] Optional resampling sound to 44kHz on playback and on export
-- Set class to character mapping tool (via SymbolClass) context menu on characters
+- Set AS3 class linkage dialog (uses SymbolClass tag) in the context menu for characters
 - [#2189] Search bar in replace character (+ replace references) window
 - [#2011], [#2215] Option to ignore frame background color when exporting (make transparent)
 - ABC Explorer - list of usages of all items
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/SetClassToCharacterMappingDialog.java b/src/com/jpexs/decompiler/flash/gui/abc/As3ClassLinkageDialog.java
similarity index 98%
rename from src/com/jpexs/decompiler/flash/gui/abc/SetClassToCharacterMappingDialog.java
rename to src/com/jpexs/decompiler/flash/gui/abc/As3ClassLinkageDialog.java
index 7543bd78d..24f28c17d 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/SetClassToCharacterMappingDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/As3ClassLinkageDialog.java
@@ -34,21 +34,17 @@ import com.jpexs.decompiler.flash.tags.base.FontTag;
 import com.jpexs.decompiler.flash.tags.base.ImageTag;
 import com.jpexs.decompiler.flash.tags.base.SoundTag;
 import com.jpexs.decompiler.flash.timeline.Timelined;
-import com.jpexs.decompiler.flash.treeitems.Openable;
-import com.jpexs.helpers.LinkedIdentityHashSet;
 import java.awt.CardLayout;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.FlowLayout;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
@@ -66,7 +62,7 @@ import javax.swing.event.DocumentListener;
  *
  * @author JPEXS
  */
-public class SetClassToCharacterMappingDialog extends AppDialog {
+public class As3ClassLinkageDialog extends AppDialog {
 
     private final JButton proceedButton = new JButton(translate("button.proceed"));
     private final JButton cancelButton = new JButton(translate("button.cancel"));
@@ -139,7 +135,7 @@ public class SetClassToCharacterMappingDialog extends AppDialog {
         return null;
     }
 
-    public SetClassToCharacterMappingDialog(Window owner, SWF swf, int characterId) {
+    public As3ClassLinkageDialog(Window owner, SWF swf, int characterId) {
         super(owner);
 
         this.swf = swf;
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
index fcf1ab86e..602404977 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
@@ -1261,7 +1261,7 @@ contextmenu.collectDepthAsSprites = Collect tags at same depth as sprites
 
 preview.resample = Resample sound to 44kHz
 
-contextmenu.setClassToCharacterMapping = Set class to character mapping
+contextmenu.setAs3ClassLinkage = Set AS3 class linkage
 
 contextmenu.cleanAbc = Clean ABC - remove unused items
 
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties
index 316c9c849..971ac0cfd 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_cs.properties
@@ -1236,7 +1236,7 @@ contextmenu.collectDepthAsSprites = Posb\u00edrat tagy ve stejn\u00e9 hloubce do
 
 preview.resample = Resample sound to 44kHz
 
-contextmenu.setClassToCharacterMapping = Nastavit mapov\u00e1n\u00ed t\u0159\u00eddy na charakter
+contextmenu.setAs3ClassLinkage = Nastavit vazbu na AS3 t\u0159\u00eddu
 
 contextmenu.cleanAbc = Vy\u010distit ABC - odebrat nepou\u017e\u00edvan\u00e9 polo\u017eky
 
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/abc/SetClassToCharacterMappingDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/abc/As3ClassLinkageDialog.properties
similarity index 97%
rename from src/com/jpexs/decompiler/flash/gui/locales/abc/SetClassToCharacterMappingDialog.properties
rename to src/com/jpexs/decompiler/flash/gui/locales/abc/As3ClassLinkageDialog.properties
index 5cbcaf9b4..0dff7875c 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/abc/SetClassToCharacterMappingDialog.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/abc/As3ClassLinkageDialog.properties
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-dialog.title = Set class to character mapping
+dialog.title = AS3 class linkage
 button.ok = OK
 button.proceed = Proceed
 button.cancel = Cancel
diff --git a/src/com/jpexs/decompiler/flash/gui/locales/abc/SetClassToCharacterMappingDialog_cs.properties b/src/com/jpexs/decompiler/flash/gui/locales/abc/As3ClassLinkageDialog_cs.properties
similarity index 96%
rename from src/com/jpexs/decompiler/flash/gui/locales/abc/SetClassToCharacterMappingDialog_cs.properties
rename to src/com/jpexs/decompiler/flash/gui/locales/abc/As3ClassLinkageDialog_cs.properties
index c700f1ab3..f39dce287 100644
--- a/src/com/jpexs/decompiler/flash/gui/locales/abc/SetClassToCharacterMappingDialog_cs.properties
+++ b/src/com/jpexs/decompiler/flash/gui/locales/abc/As3ClassLinkageDialog_cs.properties
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-dialog.title = Nastavit mapov\u00e1n\u00ed t\u0159\u00eddy na charakter
+dialog.title = Vazba na AS3 t\u0159\u00eddu
 button.ok = OK
 button.proceed = Pokra\u010dovat
 button.cancel = Storno
diff --git a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
index bc2dce357..5e2cefe67 100644
--- a/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
+++ b/src/com/jpexs/decompiler/flash/gui/tagtree/TagTreeContextMenu.java
@@ -50,7 +50,7 @@ import com.jpexs.decompiler.flash.gui.ViewMessages;
 import com.jpexs.decompiler.flash.gui.abc.ABCExplorerDialog;
 import com.jpexs.decompiler.flash.gui.abc.AddClassDialog;
 import com.jpexs.decompiler.flash.gui.abc.ClassesListTreeModel;
-import com.jpexs.decompiler.flash.gui.abc.SetClassToCharacterMappingDialog;
+import com.jpexs.decompiler.flash.gui.abc.As3ClassLinkageDialog;
 import com.jpexs.decompiler.flash.gui.action.AddScriptDialog;
 import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
 import com.jpexs.decompiler.flash.packers.Packer;
@@ -174,7 +174,7 @@ public class TagTreeContextMenu extends JPopupMenu {
 
     private JMenuItem configurePathResolvingMenuItem;
     
-    private JMenuItem setClassToCharacterMappingMenuItem;
+    private JMenuItem setAs3ClassLinkageMenuItem;
 
     private JMenuItem expandRecursiveMenuItem;
 
@@ -451,10 +451,10 @@ public class TagTreeContextMenu extends JPopupMenu {
         replaceRefsWithTagMenuItem.setIcon(View.getIcon("replacewithtag16"));
         add(replaceRefsWithTagMenuItem);
 
-        setClassToCharacterMappingMenuItem = new JMenuItem(mainPanel.translate("contextmenu.setClassToCharacterMapping")); //FIXME
-        setClassToCharacterMappingMenuItem.addActionListener(this::setClassToCharacterMappingActionPerformed);
-        setClassToCharacterMappingMenuItem.setIcon(View.getIcon("asclass16"));
-        add(setClassToCharacterMappingMenuItem);
+        setAs3ClassLinkageMenuItem = new JMenuItem(mainPanel.translate("contextmenu.setAs3ClassLinkage")); //FIXME
+        setAs3ClassLinkageMenuItem.addActionListener(this::setAs3ClassLinkageActionPerformed);
+        setAs3ClassLinkageMenuItem.setIcon(View.getIcon("asclass16"));
+        add(setAs3ClassLinkageMenuItem);
 
         abcExplorerMenuItem = new JMenuItem(mainPanel.translate("contextmenu.abcexplorer"));
         abcExplorerMenuItem.addActionListener(this::abcExplorerActionPerformed);
@@ -1126,7 +1126,7 @@ public class TagTreeContextMenu extends JPopupMenu {
 
         boolean hasExportableNodes = tree.hasExportableNodes();
 
-        setClassToCharacterMappingMenuItem.setVisible(false);
+        setAs3ClassLinkageMenuItem.setVisible(false);
         expandRecursiveMenuItem.setVisible(false);
         collapseRecursiveMenuItem.setVisible(false);
         pinMenuItem.setVisible(false);
@@ -1369,8 +1369,8 @@ public class TagTreeContextMenu extends JPopupMenu {
 
             if ((firstItem instanceof CharacterTag)) {
                 CharacterTag cht = (CharacterTag) firstItem;
-                if (cht.getSwf().isAS3() && SetClassToCharacterMappingDialog.getParentClassFromCharacter(cht) != null) {
-                    setClassToCharacterMappingMenuItem.setVisible(true);
+                if (cht.getSwf().isAS3() && As3ClassLinkageDialog.getParentClassFromCharacter(cht) != null) {
+                    setAs3ClassLinkageMenuItem.setVisible(true);
                 }
             }
 
@@ -2578,10 +2578,10 @@ public class TagTreeContextMenu extends JPopupMenu {
     II. if the previous Symbolclass is empty, remove it
     III. add new character mapping to new SymbolClass determined
      */
-    private void setClassToCharacterMappingActionPerformed(ActionEvent evt) {
+    private void setAs3ClassLinkageActionPerformed(ActionEvent evt) {
         CharacterTag ch = (CharacterTag) getCurrentItem();
         SWF swf = ch.getSwf();
-        SetClassToCharacterMappingDialog d = new SetClassToCharacterMappingDialog(Main.getDefaultDialogsOwner(), swf, ch.getCharacterId());
+        As3ClassLinkageDialog d = new As3ClassLinkageDialog(Main.getDefaultDialogsOwner(), swf, ch.getCharacterId());
         if (d.showDialog() != AppDialog.OK_OPTION) {
             return;
         }