diff --git a/firmware/esp32/gdoor/main.cpp b/firmware/esp32/gdoor/main.cpp
index a399e07..ad784c9 100644
--- a/firmware/esp32/gdoor/main.cpp
+++ b/firmware/esp32/gdoor/main.cpp
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
@@ -62,7 +62,7 @@ void output(GDOOR_DATA_PROTOCOL &busmessage, const char* topic, bool force=false
 void setup() {
     Serial.begin(115200);
     Serial.setTimeout(1);
-    JSONDEBUG("GDOOR Setup start");
+    JSONDEBUG("GDoor Setup start");
     
     WIFI_HELPER::setup();
     MQTT_HELPER::setup(WIFI_HELPER::mqtt_server(),
@@ -78,7 +78,7 @@ void setup() {
     mqtt_topic_bus_rx = WIFI_HELPER::mqtt_topic_bus_rx();
     debug = WIFI_HELPER::debug();
 
-    JSONDEBUG("GDOOR Setup done");
+    JSONDEBUG("GDoor Setup done");
     JSONDEBUG("RX Pin: ");
     JSONDEBUG(WIFI_HELPER::rx_pin());
     JSONDEBUG("RX Sensitivity: ");
diff --git a/firmware/esp32/gdoor/manifest.json b/firmware/esp32/gdoor/manifest.json
new file mode 100644
index 0000000..5ebe8cf
--- /dev/null
+++ b/firmware/esp32/gdoor/manifest.json
@@ -0,0 +1,15 @@
+{
+    "name": "GDoor",
+    "version": "dev",
+    "builds": [
+        {
+            "chipFamily": "ESP32",
+            "parts": [
+                {
+                    "path": "firmware_merged.bin",
+                    "offset": 0
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/firmware/esp32/gdoor/merge_firmware.py b/firmware/esp32/gdoor/merge_firmware.py
index 993a91a..a1d8c7c 100644
--- a/firmware/esp32/gdoor/merge_firmware.py
+++ b/firmware/esp32/gdoor/merge_firmware.py
@@ -30,4 +30,4 @@ def merge_bin(source, target, env):
     )
 
 # Add a post action that runs esptoolpy to merge available flash images
-env.AddPostAction(APP_BIN , merge_bin)
\ No newline at end of file
+env.AddPostAction(APP_BIN, merge_bin)
\ No newline at end of file
diff --git a/firmware/esp32/gdoor/src/defines.h b/firmware/esp32/gdoor/src/defines.h
index 03789bf..9d0ae02 100644
--- a/firmware/esp32/gdoor/src/defines.h
+++ b/firmware/esp32/gdoor/src/defines.h
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
@@ -17,7 +17,7 @@
 #ifndef DEFINES_H
 #define DEFINES_H
 
-// GDOOR
+// GDoor
 #define MAX_WORDLEN 25
 
 // RX Statemachine
@@ -40,7 +40,7 @@
 #define STATE_SENDING 0x01
 
 // WIFI
-#define DEFAULT_WIFI_SSID     "GDOOR"
+#define DEFAULT_WIFI_SSID     "GDoor"
 #define DEFAULT_WIFI_PASSWORD "12345678"
 
 // MQTT
diff --git a/firmware/esp32/gdoor/src/gdoor.cpp b/firmware/esp32/gdoor/src/gdoor.cpp
index 9d93790..4410b7f 100644
--- a/firmware/esp32/gdoor/src/gdoor.cpp
+++ b/firmware/esp32/gdoor/src/gdoor.cpp
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
@@ -18,7 +18,7 @@
 
 namespace GDOOR {
     /*
-    * Setup everything needed for GDOOR.
+    * Setup everything needed for GDoor.
     * @param int txpin Pin number where PWM is created when sending out data
     * @param int txenpin Pin number where output buffer is turned on/off
     * @param int rxpin Pin number where pulses from bus are received
diff --git a/firmware/esp32/gdoor/src/gdoor.h b/firmware/esp32/gdoor/src/gdoor.h
index 037b1a8..691e383 100644
--- a/firmware/esp32/gdoor/src/gdoor.h
+++ b/firmware/esp32/gdoor/src/gdoor.h
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
diff --git a/firmware/esp32/gdoor/src/gdoor_data.cpp b/firmware/esp32/gdoor/src/gdoor_data.cpp
index f47e1da..fc08a7d 100644
--- a/firmware/esp32/gdoor/src/gdoor_data.cpp
+++ b/firmware/esp32/gdoor/src/gdoor_data.cpp
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
diff --git a/firmware/esp32/gdoor/src/gdoor_data.h b/firmware/esp32/gdoor/src/gdoor_data.h
index efffb5e..e32dbea 100644
--- a/firmware/esp32/gdoor/src/gdoor_data.h
+++ b/firmware/esp32/gdoor/src/gdoor_data.h
@@ -1,7 +1,7 @@
 
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
diff --git a/firmware/esp32/gdoor/src/gdoor_rx.cpp b/firmware/esp32/gdoor/src/gdoor_rx.cpp
index 8b4637c..7c76ec9 100644
--- a/firmware/esp32/gdoor/src/gdoor_rx.cpp
+++ b/firmware/esp32/gdoor/src/gdoor_rx.cpp
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
@@ -103,7 +103,7 @@ namespace GDOOR_RX {
     
 
     /*
-    * Function called by user to setup everything needed for GDOOR.
+    * Function called by user to setup everything needed for GDoor.
     * @param int rxpin Pin number where pulses from bus are received
     */
     void setup(uint8_t rxpin) {
diff --git a/firmware/esp32/gdoor/src/gdoor_rx.h b/firmware/esp32/gdoor/src/gdoor_rx.h
index de65fc8..f073127 100644
--- a/firmware/esp32/gdoor/src/gdoor_rx.h
+++ b/firmware/esp32/gdoor/src/gdoor_rx.h
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
diff --git a/firmware/esp32/gdoor/src/gdoor_tx.cpp b/firmware/esp32/gdoor/src/gdoor_tx.cpp
index adaf06d..a7c322c 100644
--- a/firmware/esp32/gdoor/src/gdoor_tx.cpp
+++ b/firmware/esp32/gdoor/src/gdoor_tx.cpp
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
@@ -130,7 +130,7 @@ namespace GDOOR_TX {
     }
 
     /*
-    * Function called by user to setup everything needed for GDOOR.
+    * Function called by user to setup everything needed for GDoor.
     * @param int txpin Pin number where PWM is created when sending out data
     * @param int txenpin Pin number where output buffer is turned on/off
     */
diff --git a/firmware/esp32/gdoor/src/gdoor_tx.h b/firmware/esp32/gdoor/src/gdoor_tx.h
index 26cc103..6be152b 100644
--- a/firmware/esp32/gdoor/src/gdoor_tx.h
+++ b/firmware/esp32/gdoor/src/gdoor_tx.h
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
diff --git a/firmware/esp32/gdoor/src/gdoor_utils.cpp b/firmware/esp32/gdoor/src/gdoor_utils.cpp
index 20fe407..777d6eb 100644
--- a/firmware/esp32/gdoor/src/gdoor_utils.cpp
+++ b/firmware/esp32/gdoor/src/gdoor_utils.cpp
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
diff --git a/firmware/esp32/gdoor/src/gdoor_utils.h b/firmware/esp32/gdoor/src/gdoor_utils.h
index 9732c4b..077f0cd 100644
--- a/firmware/esp32/gdoor/src/gdoor_utils.h
+++ b/firmware/esp32/gdoor/src/gdoor_utils.h
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
diff --git a/firmware/esp32/gdoor/src/mqtt_helper.cpp b/firmware/esp32/gdoor/src/mqtt_helper.cpp
index 9b44b89..772fdbc 100644
--- a/firmware/esp32/gdoor/src/mqtt_helper.cpp
+++ b/firmware/esp32/gdoor/src/mqtt_helper.cpp
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
@@ -104,9 +104,9 @@ namespace MQTT_HELPER { //Namespace as we can only use it once
      *  "uniq_id": "gdoor_data_mac",
      *  "device": {
      *      "sw_version": "3.0",
-     *      "name": "GDOOR Adapter",
+     *      "name": "GDoor Adapter",
      *      "model": "ESP32 (de:ad:be:ef)",
-     *      "manufacturer": "GDOOR Project",
+     *      "manufacturer": "GDoor Project",
      *      "configuration_url": "http://127.0.0.1",
      *      "ids": "gdoor_mac",
      *      "availability_topic": "homeassistant/sensor/gdoor/data/config/mac"
@@ -132,8 +132,8 @@ R"""(
 "value_template": "{{ value_json.action }}",
 "device": {
 "sw_version": "3.0",
-"name": "GDOOR Adapter",
-"manufacturer": "GDOOR Project",
+"name": "GDoor Adapter",
+"manufacturer": "GDoor Project",
 )"""
 "";
 
diff --git a/firmware/esp32/gdoor/src/mqtt_helper.h b/firmware/esp32/gdoor/src/mqtt_helper.h
index 157af9c..c0307df 100644
--- a/firmware/esp32/gdoor/src/mqtt_helper.h
+++ b/firmware/esp32/gdoor/src/mqtt_helper.h
@@ -1,7 +1,7 @@
 
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
diff --git a/firmware/esp32/gdoor/src/printer_helper.h b/firmware/esp32/gdoor/src/printer_helper.h
index c6c9b2f..314caf3 100644
--- a/firmware/esp32/gdoor/src/printer_helper.h
+++ b/firmware/esp32/gdoor/src/printer_helper.h
@@ -1,7 +1,7 @@
 
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
diff --git a/firmware/esp32/gdoor/src/wifi_helper.cpp b/firmware/esp32/gdoor/src/wifi_helper.cpp
index b89f210..2f5c39c 100644
--- a/firmware/esp32/gdoor/src/wifi_helper.cpp
+++ b/firmware/esp32/gdoor/src/wifi_helper.cpp
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by  
@@ -332,7 +332,7 @@ namespace WIFI_HELPER { //Namespace as we can only use it once
         wifiManager.setSaveConfigCallback(on_save);
         wifiManager.setSaveParamsCallback(on_save);
 
-        wifiManager.setHostname("GDOOR");
+        wifiManager.setHostname("GDoor");
         wifiManager.setShowPassword(true);
         
         wifiManager.setBreakAfterConfig(true);
diff --git a/firmware/esp32/gdoor/src/wifi_helper.h b/firmware/esp32/gdoor/src/wifi_helper.h
index 2e4179f..c0a9769 100644
--- a/firmware/esp32/gdoor/src/wifi_helper.h
+++ b/firmware/esp32/gdoor/src/wifi_helper.h
@@ -1,6 +1,6 @@
 /* 
- * This file is part of the GDOOR distribution (https://github.com/gdoor-org).
- * Copyright (c) 2024 GDOOR Authors.
+ * This file is part of the GDoor distribution (https://github.com/gdoor-org).
+ * Copyright (c) 2024 GDoor authors.
  * 
  * This program is free software: you can redistribute it and/or modify  
  * it under the terms of the GNU General Public License as published by