diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
index b78928e651e..db0d1d8b3a2 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
@@ -69,7 +69,7 @@ public class GuiInterfaceTerminal extends AEBaseGui {
 
     private static final int OFFSET_X = 21;
     private static final int MAGIC_HEIGHT_NUMBER = 52 + 99;
-    private static final String MOLECULAR_ASSEMBLER = "molecular assembler";
+    private static final String MOLECULAR_ASSEMBLER = "tile.appliedenergistics2.molecular_assembler";
 
     private final boolean jeiEnabled;
     private final int jeiButtonPadding;
@@ -536,7 +536,8 @@ private void refreshList() {
                 continue;
             }
             // Exit if molecular assembler filter is on and this is not a molecular assembler
-            if (onlyMolecularAssemblers && !entry.getName().toLowerCase().contains(MOLECULAR_ASSEMBLER)) {
+            // Forge documantation said unlocalized name shouldn't be use for logic, so we might need a better way......
+            if (onlyMolecularAssemblers && !entry.getUnlocalizedName().equals(MOLECULAR_ASSEMBLER)) {
                 cachedSearch.remove(entry);
                 continue;
             }
diff --git a/src/main/java/appeng/client/me/ClientDCInternalInv.java b/src/main/java/appeng/client/me/ClientDCInternalInv.java
index d3bac675f7a..d221e008ba0 100644
--- a/src/main/java/appeng/client/me/ClientDCInternalInv.java
+++ b/src/main/java/appeng/client/me/ClientDCInternalInv.java
@@ -55,6 +55,10 @@ public String getName() {
         return s;
     }
 
+    public String getUnlocalizedName() {
+        return this.unlocalizedName;
+    }
+
     @Override
     public int compareTo(@Nonnull final ClientDCInternalInv o) {
         return Long.compare(this.sortBy, o.sortBy);
diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java
index bf2d5f80b43..3a34c68ef33 100644
--- a/src/main/java/appeng/helpers/DualityInterface.java
+++ b/src/main/java/appeng/helpers/DualityInterface.java
@@ -1455,7 +1455,13 @@ public String getTermName() {
                 }
 
                 if (what.getItem() != Items.AIR) {
-                    return what.getItem().getItemStackDisplayName(what);
+                    /* getTranslationKey() and getUnlocalizedNameInefficiently() have different return values in some mod 
+                     * For the Thermal Expansion
+                     * getTranslationKey() returns complete key ending with ".name".
+                     * getUnlocalizedNameInefficiently() returns localized name
+                     * Because CoFH Core overrides method getTranslationKey()
+                     */
+                    return what.getItem().getTranslationKey(what);
                 }
 
                 final Item item = Item.getItemFromBlock(directedBlock);