diff --git a/edrumulus_util.h b/common.h
similarity index 100%
rename from edrumulus_util.h
rename to common.h
diff --git a/edrumulus.h b/edrumulus.h
index 0247704..a8376ba 100644
--- a/edrumulus.h
+++ b/edrumulus.h
@@ -18,9 +18,9 @@
 #pragma once
 
 #include "Arduino.h"
-#include "edrumulus_pad.h"
-#include "edrumulus_util.h"
-#include "edrumulus_hardware.h"
+#include "common.h"
+#include "pad.h"
+#include "hardware.h"
 
 
 class Edrumulus
diff --git a/edrumulus_hardware.cpp b/hardware.cpp
similarity index 99%
rename from edrumulus_hardware.cpp
rename to hardware.cpp
index 15793e9..d8bb39d 100644
--- a/edrumulus_hardware.cpp
+++ b/hardware.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 \******************************************************************************/
 
-#include "edrumulus_hardware.h"
+#include "hardware.h"
 
 Edrumulus_hardware* edrumulus_hardware_pointer = nullptr;
 
diff --git a/edrumulus_hardware.h b/hardware.h
similarity index 99%
rename from edrumulus_hardware.h
rename to hardware.h
index 5cbf319..b685502 100644
--- a/edrumulus_hardware.h
+++ b/hardware.h
@@ -19,7 +19,7 @@
 
 #include "Arduino.h"
 #include "EEPROM.h"
-#include "edrumulus_util.h"
+#include "common.h"
 
 
 #define MAX_EEPROM_SIZE      512 // bytes (Teensy 4.0: max 1024 bytes)
diff --git a/edrumulus_pad.cpp b/pad.cpp
similarity index 99%
rename from edrumulus_pad.cpp
rename to pad.cpp
index d2c4d55..86e6188 100644
--- a/edrumulus_pad.cpp
+++ b/pad.cpp
@@ -15,7 +15,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 \******************************************************************************/
 
-#include "edrumulus_pad.h"
+#include "pad.h"
 
 
 void Pad::setup ( const int conf_Fs )
diff --git a/edrumulus_pad.h b/pad.h
similarity index 99%
rename from edrumulus_pad.h
rename to pad.h
index dae0a3e..a7ff8ee 100644
--- a/edrumulus_pad.h
+++ b/pad.h
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "edrumulus_hardware.h"
-#include "edrumulus_util.h"
+#include "common.h"
+#include "hardware.h"
 
 
 class Pad
diff --git a/edrumulus_parameters.cpp b/parameters.cpp
similarity index 100%
rename from edrumulus_parameters.cpp
rename to parameters.cpp
diff --git a/edrumulus_signalprocessing.cpp b/signalprocessing.cpp
similarity index 99%
rename from edrumulus_signalprocessing.cpp
rename to signalprocessing.cpp
index 3cce946..461bea3 100644
--- a/edrumulus_signalprocessing.cpp
+++ b/signalprocessing.cpp
@@ -15,8 +15,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 \******************************************************************************/
 
-#include "edrumulus_util.h"
-#include "edrumulus_pad.h"
+#include "common.h"
+#include "pad.h"
 
 
 // Pad -------------------------------------------------------------------------
diff --git a/edrumulus_teensy_usbname.c b/teensy_name.c
similarity index 100%
rename from edrumulus_teensy_usbname.c
rename to teensy_name.c