diff --git a/README.md b/README.md
index 77fa357..b9d3dab 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ When manually installing this library, you have to manually download [Arduino MI
## Usage
### Basic / Default
```cpp
-#include
-#include
+#include
+#include
...
BLEMIDI_CREATE_DEFAULT_ESP32_INSTANCE();
...
diff --git a/examples/MidiBle/MidiBle.ino b/examples/MidiBle/MidiBle.ino
index 579c6dd..1a65d6f 100644
--- a/examples/MidiBle/MidiBle.ino
+++ b/examples/MidiBle/MidiBle.ino
@@ -1,4 +1,4 @@
-#include
+#include
#include
//#include
diff --git a/keywords.txt b/keywords.txt
index ed9ca64..76cb26d 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -5,7 +5,7 @@
#######################################
# Datatypes (KEYWORD1)
#######################################
-BLE-MIDI.h KEYWORD1
+BLEMIDI.h KEYWORD1
BLEMIDI KEYWORD1
#######################################
diff --git a/library.properties b/library.properties
index ba2aa2e..73617cc 100644
--- a/library.properties
+++ b/library.properties
@@ -7,5 +7,5 @@ paragraph=MIDI over Bluetooth Low Energy (BLE-MIDI) 1.0 for Arduino
category=Communication
url=https://github.com/lathoub/Arduino-BLE-MIDI
architectures=esp32,samd,megaavr,mbed,nrf52
-includes=BLE-MIDI.h
+includes=BLEMIDI.h
depends=MIDI Library, NimBLE-Arduino, ArduinoBLE
diff --git a/src/BLE-MIDI.cpp b/src/BLE-MIDI.cpp
deleted file mode 100644
index 258e5f5..0000000
--- a/src/BLE-MIDI.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "BLE-MIDI.h"
\ No newline at end of file
diff --git a/src/BLEMIDI.cpp b/src/BLEMIDI.cpp
new file mode 100644
index 0000000..e2b30e3
--- /dev/null
+++ b/src/BLEMIDI.cpp
@@ -0,0 +1 @@
+#include "BLEMIDI.h"
\ No newline at end of file
diff --git a/src/BLE-MIDI.h b/src/BLEMIDI.h
similarity index 99%
rename from src/BLE-MIDI.h
rename to src/BLEMIDI.h
index a9a9581..2e2f1f4 100644
--- a/src/BLE-MIDI.h
+++ b/src/BLEMIDI.h
@@ -7,9 +7,9 @@
#include
using namespace MIDI_NAMESPACE;
-#include "BLE-MIDI_Settings.h"
-#include "BLE-MIDI_Defs.h"
-#include "BLE-MIDI_Namespace.h"
+#include "BLEMIDI_Settings.h"
+#include "BLEMIDI_Defs.h"
+#include "BLEMIDI_Namespace.h"
BEGIN_BLEMIDI_NAMESPACE
diff --git a/src/BLE-MIDI_Config.h b/src/BLEMIDI_Config.h
similarity index 100%
rename from src/BLE-MIDI_Config.h
rename to src/BLEMIDI_Config.h
diff --git a/src/BLE-MIDI_Defs.h b/src/BLEMIDI_Defs.h
similarity index 92%
rename from src/BLE-MIDI_Defs.h
rename to src/BLEMIDI_Defs.h
index abf34e0..7aa1805 100644
--- a/src/BLE-MIDI_Defs.h
+++ b/src/BLEMIDI_Defs.h
@@ -1,6 +1,6 @@
#pragma once
-#include "BLE-MIDI_Namespace.h"
+#include "BLEMIDI_Namespace.h"
// As specified in
// Specification for MIDI over Bluetooth Low Energy (BLE-MIDI)
diff --git a/src/BLE-MIDI_Namespace.h b/src/BLEMIDI_Namespace.h
similarity index 100%
rename from src/BLE-MIDI_Namespace.h
rename to src/BLEMIDI_Namespace.h
diff --git a/src/BLE-MIDI_Settings.h b/src/BLEMIDI_Settings.h
similarity index 80%
rename from src/BLE-MIDI_Settings.h
rename to src/BLEMIDI_Settings.h
index ce60366..f4c8b5a 100644
--- a/src/BLE-MIDI_Settings.h
+++ b/src/BLEMIDI_Settings.h
@@ -1,6 +1,6 @@
#pragma once
-#include "BLE-MIDI_Namespace.h"
+#include "BLEMIDI_Namespace.h"
BEGIN_BLEMIDI_NAMESPACE