diff --git a/libs/midi++2/midichannel.cc b/libs/midi++2/channel.cc
similarity index 100%
rename from libs/midi++2/midichannel.cc
rename to libs/midi++2/channel.cc
diff --git a/libs/midi++2/midifactory.cc b/libs/midi++2/factory.cc
similarity index 100%
rename from libs/midi++2/midifactory.cc
rename to libs/midi++2/factory.cc
diff --git a/libs/midi++2/midimanager.cc b/libs/midi++2/manager.cc
similarity index 100%
rename from libs/midi++2/midimanager.cc
rename to libs/midi++2/manager.cc
diff --git a/libs/midi++2/midiparser.cc b/libs/midi++2/parser.cc
similarity index 100%
rename from libs/midi++2/midiparser.cc
rename to libs/midi++2/parser.cc
diff --git a/libs/midi++2/midiport.cc b/libs/midi++2/port.cc
similarity index 100%
rename from libs/midi++2/midiport.cc
rename to libs/midi++2/port.cc
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index 9d25ac9930..14974581a9 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -51,11 +51,11 @@ def build(bld):
 		fd_midiport.cc
 		fifomidi.cc
 		midi.cc
-		midichannel.cc
-		midifactory.cc
-		midimanager.cc
-		midiparser.cc
-		midiport.cc
+		channel.cc
+		factory.cc
+		manager.cc
+		parser.cc
+		port.cc
 		midnam_patch.cc
 		mmc.cc
 		mtc.cc