diff --git a/src/gui/debug.cpp b/src/gui/debug.cpp
index f1c974e8b..5ae596bcd 100644
--- a/src/gui/debug.cpp
+++ b/src/gui/debug.cpp
@@ -334,7 +334,7 @@ void putDispatchChan(void* data, int chanNum, int type) {
       break;
     }
     default:
-      ImGui::Text("Unknown system! Help!");
+      ImGui::Text("Unimplemented chip! Help!");
       break;
   }
 }
diff --git a/src/gui/debugWindow.cpp b/src/gui/debugWindow.cpp
index 6ad2ddddf..8fe02b116 100644
--- a/src/gui/debugWindow.cpp
+++ b/src/gui/debugWindow.cpp
@@ -297,7 +297,7 @@ void FurnaceGUI::drawDebug() {
     }
     if (ImGui::TreeNode("Playground")) {
       if (pgSys<0 || pgSys>=e->song.systemLen) pgSys=0;
-      if (ImGui::BeginCombo("System",fmt::sprintf("%d. %s",pgSys+1,e->getSystemName(e->song.system[pgSys])).c_str())) {
+      if (ImGui::BeginCombo("Chip",fmt::sprintf("%d. %s",pgSys+1,e->getSystemName(e->song.system[pgSys])).c_str())) {
         for (int i=0; i<e->song.systemLen; i++) {
           if (ImGui::Selectable(fmt::sprintf("%d. %s",i+1,e->getSystemName(e->song.system[i])).c_str())) {
             pgSys=i;
@@ -358,7 +358,7 @@ void FurnaceGUI::drawDebug() {
       if (ImGui::TreeNode("Register Cheatsheet")) {
         const char** sheet=e->getRegisterSheet(pgSys);
         if (sheet==NULL) {
-          ImGui::Text("no cheatsheet available for this system.");
+          ImGui::Text("no cheatsheet available for this chip.");
         } else {
           if (ImGui::BeginTable("RegisterSheet",2,ImGuiTableFlags_SizingFixedSame)) {
             ImGui::TableNextRow();
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index c1cd7f076..8ee6c60b9 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1879,7 +1879,7 @@ void FurnaceGUI::processDrags(int dragX, int dragY) {
 #define sysAddOption(x) \
   if (ImGui::MenuItem(getSystemName(x))) { \
     if (!e->addSystem(x)) { \
-      showError("cannot add system! ("+e->getLastError()+")"); \
+      showError("cannot add chip! ("+e->getLastError()+")"); \
     } \
     updateWindowTitle(); \
   }
@@ -2887,7 +2887,7 @@ bool FurnaceGUI::loop() {
           if (ImGui::MenuItem("one file")) {
             openFileDialog(GUI_FILE_EXPORT_AUDIO_ONE);
           }
-          if (ImGui::MenuItem("multiple files (one per system)")) {
+          if (ImGui::MenuItem("multiple files (one per chip)")) {
             openFileDialog(GUI_FILE_EXPORT_AUDIO_PER_SYS);
           }
           if (ImGui::MenuItem("multiple files (one per channel)")) {
@@ -2928,7 +2928,7 @@ bool FurnaceGUI::loop() {
               "pattern indexes are ordered as they appear in the song."
             );
           }
-          ImGui::Text("systems to export:");
+          ImGui::Text("chips to export:");
           bool hasOneAtLeast=false;
           for (int i=0; i<e->song.systemLen; i++) {
             int minVersion=e->minVGMVersion(e->song.system[i]);
@@ -2937,17 +2937,17 @@ bool FurnaceGUI::loop() {
             ImGui::EndDisabled();
             if (minVersion>vgmExportVersion) {
               if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
-                ImGui::SetTooltip("this system is only available in VGM %d.%.2x and higher!",minVersion>>8,minVersion&0xff);
+                ImGui::SetTooltip("this chip is only available in VGM %d.%.2x and higher!",minVersion>>8,minVersion&0xff);
               }
             } else if (minVersion==0) {
               if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
-                ImGui::SetTooltip("this system is not supported by the VGM format!");
+                ImGui::SetTooltip("this chip is not supported by the VGM format!");
               }
             } else {
               if (willExport[i]) hasOneAtLeast=true;
             }
           }
-          ImGui::Text("select the systems you wish to export,");
+          ImGui::Text("select the chip you wish to export,");
           ImGui::Text("but only up to %d of each type.",(vgmExportVersion>=0x151)?2:1);
           if (hasOneAtLeast) {
             if (ImGui::MenuItem("click to export")) {
@@ -2972,14 +2972,14 @@ bool FurnaceGUI::loop() {
           ImGui::EndMenu();
         }
         ImGui::Separator();
-        if (ImGui::BeginMenu("add system...")) {
+        if (ImGui::BeginMenu("add chip...")) {
           for (int j=0; availableSystems[j]; j++) {
             if (!settings.hiddenSystems && (availableSystems[j]==DIV_SYSTEM_YMU759 || availableSystems[j]==DIV_SYSTEM_DUMMY)) continue;
             sysAddOption((DivSystem)availableSystems[j]);
           }
           ImGui::EndMenu();
         }
-        if (ImGui::BeginMenu("configure system...")) {
+        if (ImGui::BeginMenu("configure chip...")) {
           for (int i=0; i<e->song.systemLen; i++) {
             if (ImGui::TreeNode(fmt::sprintf("%d. %s##_SYSP%d",i+1,getSystemName(e->song.system[i]),i).c_str())) {
               drawSysConf(i,e->song.system[i],e->song.systemFlags[i],true);
@@ -2988,7 +2988,7 @@ bool FurnaceGUI::loop() {
           }
           ImGui::EndMenu();
         }
-        if (ImGui::BeginMenu("change system...")) {
+        if (ImGui::BeginMenu("change chip...")) {
           ImGui::Checkbox("Preserve channel positions",&preserveChanPos);
           for (int i=0; i<e->song.systemLen; i++) {
             if (ImGui::BeginMenu(fmt::sprintf("%d. %s##_SYSC%d",i+1,getSystemName(e->song.system[i]),i).c_str())) {
@@ -3001,12 +3001,12 @@ bool FurnaceGUI::loop() {
           }
           ImGui::EndMenu();
         }
-        if (ImGui::BeginMenu("remove system...")) {
+        if (ImGui::BeginMenu("remove chip...")) {
           ImGui::Checkbox("Preserve channel positions",&preserveChanPos);
           for (int i=0; i<e->song.systemLen; i++) {
             if (ImGui::MenuItem(fmt::sprintf("%d. %s##_SYSR%d",i+1,getSystemName(e->song.system[i]),i).c_str())) {
               if (!e->removeSystem(i,preserveChanPos)) {
-                showError("cannot remove system! ("+e->getLastError()+")");
+                showError("cannot remove chip! ("+e->getLastError()+")");
               }
             }
           }
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index 73e9d2333..37d4bfecf 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -468,7 +468,7 @@ void FurnaceGUI::drawSettings() {
           }
 
           bool restartOnFlagChangeB=settings.restartOnFlagChange;
-          if (ImGui::Checkbox("Restart song when changing system properties",&restartOnFlagChangeB)) {
+          if (ImGui::Checkbox("Restart song when changing chip properties",&restartOnFlagChangeB)) {
             settings.restartOnFlagChange=restartOnFlagChangeB;
           }
 
@@ -1232,11 +1232,6 @@ void FurnaceGUI::drawSettings() {
           }
           ImGui::EndDisabled();
 
-          bool chipNamesB=settings.chipNames;
-          if (ImGui::Checkbox("Use chip names instead of system names",&chipNamesB)) {
-            settings.chipNames=chipNamesB;
-          }
-
           bool oplStandardWaveNamesB=settings.oplStandardWaveNames;
           if (ImGui::Checkbox("Use standard OPL waveform names",&oplStandardWaveNamesB)) {
             settings.oplStandardWaveNames=oplStandardWaveNamesB;
@@ -1567,8 +1562,8 @@ void FurnaceGUI::drawSettings() {
               UI_COLOR_CONFIG(GUI_COLOR_PATTERN_EFFECT_SONG,"Song effect");
               UI_COLOR_CONFIG(GUI_COLOR_PATTERN_EFFECT_TIME,"Time effect");
               UI_COLOR_CONFIG(GUI_COLOR_PATTERN_EFFECT_SPEED,"Speed effect");
-              UI_COLOR_CONFIG(GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,"Primary system effect");
-              UI_COLOR_CONFIG(GUI_COLOR_PATTERN_EFFECT_SYS_SECONDARY,"Secondary system effect");
+              UI_COLOR_CONFIG(GUI_COLOR_PATTERN_EFFECT_SYS_PRIMARY,"Primary specific effect");
+              UI_COLOR_CONFIG(GUI_COLOR_PATTERN_EFFECT_SYS_SECONDARY,"Secondary specific effect");
               UI_COLOR_CONFIG(GUI_COLOR_PATTERN_EFFECT_MISC,"Miscellaneous");
               UI_COLOR_CONFIG(GUI_COLOR_EE_VALUE,"External command output");
               ImGui::TreePop();