diff --git a/src/common/JoyMap.cxx b/src/common/JoyMap.cxx
index cecb5df9c..648d9a3d0 100644
--- a/src/common/JoyMap.cxx
+++ b/src/common/JoyMap.cxx
@@ -168,7 +168,7 @@ string JoyMap::getEventMappingDesc(int stick, const Event::Type event, const Eve
     {
       if(buf.str() != "")
         buf << ", ";
-      buf << "J" << stick << getDesc(event, _mapping);
+      buf << "C" << stick << getDesc(event, _mapping);
     }
   }
   return buf.str();
diff --git a/src/gui/JoystickDialog.cxx b/src/gui/JoystickDialog.cxx
index d1bfbb30a..3448417f1 100644
--- a/src/gui/JoystickDialog.cxx
+++ b/src/gui/JoystickDialog.cxx
@@ -111,7 +111,7 @@ void JoystickDialog::handleCommand(CommandSender* sender, int cmd, int data, int
       {
         myRemoveBtn->setEnabled(false);
         ostringstream buf;
-        buf << "J" << myJoyIDs[data];
+        buf << "C" << myJoyIDs[data];
         myJoyText->setText(buf.str());
       }
       else