diff --git a/library/rt-backends/alsa-in/alsamidiinput.cpp b/library/rt-backends/alsa-in/alsamidiinput.cpp
index 1db4ce2..5334cb9 100644
--- a/library/rt-backends/alsa-in/alsamidiinput.cpp
+++ b/library/rt-backends/alsa-in/alsamidiinput.cpp
@@ -167,7 +167,15 @@ namespace drumstick { namespace rt {
                     int k = clientNames.count(name) + 1;
                     QString addr = QString("%1:%2").arg(p.getClient()).arg(p.getPort());
                     if (k > 2) {
-                        m_inputDevices << MIDIConnection(QString("%1 (%2)").arg(name).arg(k - namesMap[name]--), addr);
+                        QString pName = p.getName();
+                        if (pName.contains(name, Qt::CaseInsensitive)) {
+                            m_inputDevices << MIDIConnection(QString("%1 (%2)").arg(name).arg(
+                                                                 k - namesMap[name]--),
+                                                             addr);
+                        } else {
+                            m_inputDevices
+                                << MIDIConnection(QString("%1 (%2)").arg(name, pName), addr);
+                        }
                     } else {
                         m_inputDevices << MIDIConnection(name, addr);
                     }
diff --git a/library/rt-backends/alsa-out/alsamidioutput.cpp b/library/rt-backends/alsa-out/alsamidioutput.cpp
index 6081496..0246e5d 100644
--- a/library/rt-backends/alsa-out/alsamidioutput.cpp
+++ b/library/rt-backends/alsa-out/alsamidioutput.cpp
@@ -160,7 +160,15 @@ namespace rt {
                     int k = clientNames.count(name) + 1;
                     QString addr = QString("%1:%2").arg(p.getClient()).arg(p.getPort());
                     if (k > 2) {
-                        m_outputDevices << MIDIConnection(QString("%1 (%2)").arg(name).arg(k - namesMap[name]--), addr);
+                        QString pName = p.getName();
+                        if (pName.contains(name, Qt::CaseInsensitive)) {
+                            m_outputDevices << MIDIConnection(QString("%1 (%2)").arg(name).arg(
+                                                                  k - namesMap[name]--),
+                                                              addr);
+                        } else {
+                            m_outputDevices
+                                << MIDIConnection(QString("%1 (%2)").arg(name, pName), addr);
+                        }
                     } else {
                         m_outputDevices << MIDIConnection(name, addr);
                     }