diff --git a/pd/src/pd.tk b/pd/src/pd.tk
index 8d9ca2695ed43ada4f39ee3673e899bcc7f844c4..975d26049cd7778706af20c071c19ff16b02b8ae 100644
--- a/pd/src/pd.tk
+++ b/pd/src/pd.tk
@@ -1477,16 +1477,18 @@ proc menu_addstd {mbar} {
     $mbar.audio add command -label {Audio OFF} -accelerator [accel_munge "Ctrl+."] \
         -command {menu_audio 0} 
 	match_linux_wm [list $mbar.audio add separator]
+	$mbar.audio add command -label {Audio Settings} -state disabled
     for {set x 1} {$x<[llength $pd_apilist]} {incr x} {
-        $mbar.audio add radiobutton -label [concat [lindex [lindex $pd_apilist $x] 0] Audio Driver] \
+        $mbar.audio add radiobutton -label [concat [lindex [lindex $pd_apilist $x] 0] Driver] \
             -command {menu_audio 0} -variable pd_whichapi \
             -value [lindex [lindex $pd_apilist $x] 1]\
 			-selectcolor "#dddddd" \
             -command {pd [concat pd audio-setapi $pd_whichapi \;]}
     }
 	match_linux_wm [list $mbar.audio add separator]
+	$mbar.audio add command -label {MIDI Settings} -state disabled
     for {set x 0} {$x<[llength $pd_midiapilist]} {incr x} {
-        $mbar.audio add radiobutton -label [concat [lindex [lindex $pd_midiapilist $x] 0] driver]\
+        $mbar.audio add radiobutton -label [concat [lindex [lindex $pd_midiapilist $x] 0] Driver]\
             -command {menu_midi 0} -variable pd_whichmidiapi \
             -value [lindex [lindex $pd_midiapilist $x] 1]\
 			-selectcolor "#dddddd" \
diff --git a/pd/src/s_midi.c b/pd/src/s_midi.c
index e89eb8682a09f5fa1e3502839fa38b00c23c9ab7..fa2921e2d5c6cb899d49af7f97908d11ddcaf568 100644
--- a/pd/src/s_midi.c
+++ b/pd/src/s_midi.c
@@ -509,9 +509,13 @@ void sys_get_midi_apis(char *buf)
 {
     int n = 0;
     strcpy(buf, "{ ");
-    sprintf(buf + strlen(buf), "{HARDWARE-MIDI %d} ", API_DEFAULT); n++;
+#ifndef USEAPI_ALSA
+    sprintf(buf + strlen(buf), "{OSS %d} ", API_DEFAULT); n++;
+#else
+    n++;
+#endif
 #ifdef USEAPI_ALSA
-    sprintf(buf + strlen(buf), "{ALSA-MIDI %d} ", API_ALSA); n++;
+    sprintf(buf + strlen(buf), "{ALSA %d} ", API_ALSA); n++;
 #endif
     strcat(buf, "}");
         /* then again, if only one API (or none) we don't offer any choice. */