diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89391fa7..3bd6997f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(PROJECT_VER "0.6.3")
+set(PROJECT_VER "0.7.0")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(xiaozhi)
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 93e435d6..2798f57c 100755
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -1,12 +1,12 @@
-set(SOURCES "AudioDevice.cc"
-            "FirmwareUpgrade.cc"
-            "SystemInfo.cc"
-            "SystemReset.cc"
-            "Application.cc"
-            "Button.cc"
-            "BuiltinLed.cc"
-            "Display.cc"
-            "Board.cc"
+set(SOURCES "audio_device.cc"
+            "system_info.cc"
+            "system_reset.cc"
+            "application.cc"
+            "button.cc"
+            "builtin_led.cc"
+            "display.cc"
+            "board.cc"
+            "ota.cc"
             "main.cc"
             )
 set(INCLUDE_DIRS ".")
@@ -16,46 +16,46 @@ if(CONFIG_BOARD_TYPE_BREAD_COMPACT_WIFI)
     # add all files from boards/bread-compact-wifi
     set(BOARD_TYPE "bread-compact-wifi")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "WifiBoard.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "wifi_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
 elseif(CONFIG_BOARD_TYPE_BREAD_COMPACT_ML307)
     # add all files from boards/bread-compact-ml307
     set(BOARD_TYPE "bread-compact-ml307")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "Ml307Board.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "ml307_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
 elseif(CONFIG_BOARD_TYPE_ESP_BOX_3)
     # add all files from boards/esp-box-3
     set(BOARD_TYPE "esp-box-3")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "WifiBoard.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "wifi_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
-    list(APPEND SOURCES "BoxAudioDevice.cc")
+    list(APPEND SOURCES "box_audio_device.cc")
 elseif(CONFIG_BOARD_TYPE_KEVIN_BOX_0)
     # add all files from boards/kevin-box-0
     set(BOARD_TYPE "kevin-box-0")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "Ml307Board.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "ml307_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
-    list(APPEND SOURCES "BoxAudioDevice.cc")
+    list(APPEND SOURCES "box_audio_device.cc")
 elseif(CONFIG_BOARD_TYPE_KEVIN_BOX_1)
     # add all files from boards/kevin-box-1
     set(BOARD_TYPE "kevin-box-1")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "Ml307Board.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "ml307_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
-    list(APPEND SOURCES "BoxAudioDevice.cc")
+    list(APPEND SOURCES "box_audio_device.cc")
 elseif(CONFIG_BOARD_TYPE_LICHUANG_DEV)
     # add all files from boards/lichuang-dev
     set(BOARD_TYPE "lichuang-dev")
     file(GLOB BOARD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE}/*.cc)
-    list(APPEND SOURCES ${BOARD_SOURCES} "WifiBoard.cc")
+    list(APPEND SOURCES ${BOARD_SOURCES} "wifi_board.cc")
     list(APPEND INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/boards/${BOARD_TYPE})
-    list(APPEND SOURCES "BoxAudioDevice.cc")
+    list(APPEND SOURCES "box_audio_device.cc")
 endif()
 
 if(CONFIG_USE_AFE_SR)
-    list(APPEND SOURCES "AudioProcessor.cc" "WakeWordDetect.cc")
+    list(APPEND SOURCES "audio_processor.cc" "wake_word_detect.cc")
 endif()
 
 idf_component_register(SRCS ${SOURCES}
diff --git a/main/Application.cc b/main/application.cc
similarity index 97%
rename from main/Application.cc
rename to main/application.cc
index a8ee1d2d..e18429bb 100644
--- a/main/Application.cc
+++ b/main/application.cc
@@ -1,8 +1,7 @@
-#include <BuiltinLed.h>
-#include <Ml307SslTransport.h>
-#include <WifiConfigurationAp.h>
-#include <WifiStation.h>
-#include <SystemInfo.h>
+#include "builtin_led.h"
+#include "system_info.h"
+#include "ml307_ssl_transport.h"
+#include "application.h"
 
 #include <cstring>
 #include <esp_log.h>
@@ -10,8 +9,6 @@
 #include <driver/gpio.h>
 #include <arpa/inet.h>
 
-#include "Application.h"
-
 #define TAG "Application"
 
 extern const char p3_err_reg_start[] asm("_binary_err_reg_p3_start");
@@ -40,8 +37,8 @@ Application::Application()
         reference_resampler_.Configure(AUDIO_INPUT_SAMPLE_RATE, 16000);
     }
 
-    firmware_upgrade_.SetCheckVersionUrl(CONFIG_OTA_VERSION_URL);
-    firmware_upgrade_.SetHeader("Device-Id", SystemInfo::GetMacAddress().c_str());
+    ota_.SetCheckVersionUrl(CONFIG_OTA_VERSION_URL);
+    ota_.SetHeader("Device-Id", SystemInfo::GetMacAddress().c_str());
 }
 
 Application::~Application() {
@@ -70,15 +67,15 @@ Application::~Application() {
 
 void Application::CheckNewVersion() {
     // Check if there is a new firmware version available
-    firmware_upgrade_.SetPostData(Board::GetInstance().GetJson());
-    firmware_upgrade_.CheckVersion();
-    if (firmware_upgrade_.HasNewVersion()) {
+    ota_.SetPostData(Board::GetInstance().GetJson());
+    ota_.CheckVersion();
+    if (ota_.HasNewVersion()) {
         // Wait for the chat state to be idle
         while (chat_state_ != kChatStateIdle) {
             vTaskDelay(100);
         }
         SetChatState(kChatStateUpgrading);
-        firmware_upgrade_.StartUpgrade([this](int progress, size_t speed) {
+        ota_.StartUpgrade([this](int progress, size_t speed) {
             char buffer[64];
             snprintf(buffer, sizeof(buffer), "Upgrading...\n %d%% %zuKB/s", progress, speed / 1024);
             display_.SetText(buffer);
@@ -87,7 +84,7 @@ void Application::CheckNewVersion() {
         ESP_LOGI(TAG, "Firmware upgrade failed...");
         SetChatState(kChatStateIdle);
     } else {
-        firmware_upgrade_.MarkCurrentVersionValid();
+        ota_.MarkCurrentVersionValid();
     }
 }
 
diff --git a/main/Application.h b/main/application.h
similarity index 92%
rename from main/Application.h
rename to main/application.h
index 9db68f34..9ea7bdbe 100644
--- a/main/Application.h
+++ b/main/application.h
@@ -9,21 +9,21 @@
 #include <list>
 #include <condition_variable>
 
-#include <OpusEncoder.h>
-#include <OpusResampler.h>
-#include <WebSocket.h>
+#include "opus_encoder.h"
+#include "opus_resampler.h"
+#include <web_socket.h>
 
-#include "AudioDevice.h"
-#include "Display.h"
-#include "Board.h"
-#include "FirmwareUpgrade.h"
+#include "audio_device.h"
+#include "display.h"
+#include "board.h"
+#include "ota.h"
 
 #ifdef CONFIG_USE_AFE_SR
-#include "WakeWordDetect.h"
-#include "AudioProcessor.h"
+#include "wake_word_detect.h"
+#include "audio_processor.h"
 #endif
 
-#include "Button.h"
+#include "button.h"
 
 #define DETECTION_RUNNING 1
 #define COMMUNICATION_RUNNING 2
@@ -95,7 +95,7 @@ private:
     WakeWordDetect wake_word_detect_;
     AudioProcessor audio_processor_;
 #endif
-    FirmwareUpgrade firmware_upgrade_;
+    Ota ota_;
     std::mutex mutex_;
     std::condition_variable_any cv_;
     std::list<std::function<void()>> main_tasks_;
diff --git a/main/AudioDevice.cc b/main/audio_device.cc
similarity index 99%
rename from main/AudioDevice.cc
rename to main/audio_device.cc
index 076b368d..4dfb9025 100644
--- a/main/AudioDevice.cc
+++ b/main/audio_device.cc
@@ -1,5 +1,5 @@
-#include "AudioDevice.h"
-#include "Board.h"
+#include "audio_device.h"
+#include "board.h"
 
 #include <esp_log.h>
 #include <cstring>
diff --git a/main/AudioDevice.h b/main/audio_device.h
similarity index 98%
rename from main/AudioDevice.h
rename to main/audio_device.h
index 4a0c66f4..3a4e8b12 100644
--- a/main/AudioDevice.h
+++ b/main/audio_device.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <functional>
 
-#include "Board.h"
+#include "board.h"
 
 class AudioDevice {
 public:
diff --git a/main/AudioProcessor.cc b/main/audio_processor.cc
similarity index 99%
rename from main/AudioProcessor.cc
rename to main/audio_processor.cc
index b68406e8..803474ca 100644
--- a/main/AudioProcessor.cc
+++ b/main/audio_processor.cc
@@ -1,4 +1,4 @@
-#include "AudioProcessor.h"
+#include "audio_processor.h"
 #include <esp_log.h>
 
 #define PROCESSOR_RUNNING 0x01
diff --git a/main/AudioProcessor.h b/main/audio_processor.h
similarity index 100%
rename from main/AudioProcessor.h
rename to main/audio_processor.h
diff --git a/main/Board.cc b/main/board.cc
similarity index 98%
rename from main/Board.cc
rename to main/board.cc
index 42139dff..36de3e8a 100644
--- a/main/Board.cc
+++ b/main/board.cc
@@ -1,5 +1,5 @@
-#include "Board.h"
-#include "SystemInfo.h"
+#include "board.h"
+#include "system_info.h"
 
 #include <esp_log.h>
 #include <esp_ota_ops.h>
diff --git a/main/Board.h b/main/board.h
similarity index 96%
rename from main/Board.h
rename to main/board.h
index eaaec400..bb33a40a 100644
--- a/main/Board.h
+++ b/main/board.h
@@ -2,8 +2,9 @@
 #define BOARD_H
 
 #include "config.h"
-#include <Http.h>
-#include <WebSocket.h>
+
+#include <http.h>
+#include <web_socket.h>
 #include <string>
 
 void* create_board();
diff --git a/main/boards/bread-compact-ml307/CompactMl307Board.cc b/main/boards/bread-compact-ml307/compact_ml307_board.cc
similarity index 86%
rename from main/boards/bread-compact-ml307/CompactMl307Board.cc
rename to main/boards/bread-compact-ml307/compact_ml307_board.cc
index 4495b415..19647a5e 100644
--- a/main/boards/bread-compact-ml307/CompactMl307Board.cc
+++ b/main/boards/bread-compact-ml307/compact_ml307_board.cc
@@ -1,5 +1,7 @@
-#include "Ml307Board.h"
-#include "SystemReset.h"
+#include "ml307_board.h"
+#include "system_reset.h"
+#include "audio_device.h"
+
 #include <esp_log.h>
 
 #define TAG "CompactMl307Board"
diff --git a/main/boards/bread-compact-wifi/CompactWifiBoard.cc b/main/boards/bread-compact-wifi/compact_wifi_board.cc
similarity index 86%
rename from main/boards/bread-compact-wifi/CompactWifiBoard.cc
rename to main/boards/bread-compact-wifi/compact_wifi_board.cc
index 5213e468..a4224932 100644
--- a/main/boards/bread-compact-wifi/CompactWifiBoard.cc
+++ b/main/boards/bread-compact-wifi/compact_wifi_board.cc
@@ -1,5 +1,7 @@
-#include "WifiBoard.h"
-#include "SystemReset.h"
+#include "wifi_board.h"
+#include "system_reset.h"
+#include "audio_device.h"
+
 #include <esp_log.h>
 
 #define TAG "CompactWifiBoard"
diff --git a/main/boards/esp-box-3/config.h b/main/boards/esp-box-3/config.h
index fec73b08..aeea3536 100644
--- a/main/boards/esp-box-3/config.h
+++ b/main/boards/esp-box-3/config.h
@@ -5,7 +5,7 @@
 
 #define AUDIO_INPUT_SAMPLE_RATE  16000
 #define AUDIO_OUTPUT_SAMPLE_RATE 16000
-#define AUDIO_DEFAULT_OUTPUT_VOLUME 70
+#define AUDIO_DEFAULT_OUTPUT_VOLUME 90
 
 #define AUDIO_INPUT_REFERENCE    true
 
diff --git a/main/boards/esp-box-3/EspBox3Board.cc b/main/boards/esp-box-3/esp_box3_board.cc
similarity index 87%
rename from main/boards/esp-box-3/EspBox3Board.cc
rename to main/boards/esp-box-3/esp_box3_board.cc
index 673354c9..be488b9c 100644
--- a/main/boards/esp-box-3/EspBox3Board.cc
+++ b/main/boards/esp-box-3/esp_box3_board.cc
@@ -1,5 +1,5 @@
-#include "WifiBoard.h"
-#include "BoxAudioDevice.h"
+#include "wifi_board.h"
+#include "box_audio_device.h"
 
 #include <esp_log.h>
 
diff --git a/main/boards/kevin-box-0/KevinBoxBoard.cc b/main/boards/kevin-box-0/kevin_box_board.cc
similarity index 97%
rename from main/boards/kevin-box-0/KevinBoxBoard.cc
rename to main/boards/kevin-box-0/kevin_box_board.cc
index 8c9c4b53..bca0923c 100644
--- a/main/boards/kevin-box-0/KevinBoxBoard.cc
+++ b/main/boards/kevin-box-0/kevin_box_board.cc
@@ -1,5 +1,5 @@
-#include "Ml307Board.h"
-#include "BoxAudioDevice.h"
+#include "ml307_board.h"
+#include "box_audio_device.h"
 
 #include <esp_log.h>
 #include <esp_spiffs.h>
diff --git a/main/boards/kevin-box-1/KevinBoxBoard.cc b/main/boards/kevin-box-1/kevin_box_board.cc
similarity index 98%
rename from main/boards/kevin-box-1/KevinBoxBoard.cc
rename to main/boards/kevin-box-1/kevin_box_board.cc
index 127baa52..4b79b438 100644
--- a/main/boards/kevin-box-1/KevinBoxBoard.cc
+++ b/main/boards/kevin-box-1/kevin_box_board.cc
@@ -1,5 +1,5 @@
-#include "Ml307Board.h"
-#include "BoxAudioDevice.h"
+#include "ml307_board.h"
+#include "box_audio_device.h"
 
 #include <esp_log.h>
 #include <esp_spiffs.h>
diff --git a/main/boards/lichuang-dev/LiChuangDevBoard.cc b/main/boards/lichuang-dev/LiChuangDevBoard.cc
deleted file mode 100644
index 4418ab54..00000000
--- a/main/boards/lichuang-dev/LiChuangDevBoard.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "WifiBoard.h"
-#include "BoxAudioDevice.h"
-
-#include <esp_log.h>
-
-#define TAG "LiChuangDevBoard"
-
-class LiChuangDevBoard : public WifiBoard {
-public:
-    virtual void Initialize() override {
-        ESP_LOGI(TAG, "Initializing LiChuangDevBoard");
-        WifiBoard::Initialize();
-    }
-
-    virtual AudioDevice* CreateAudioDevice() override {
-        return new BoxAudioDevice();
-    }
-};
-
-DECLARE_BOARD(LiChuangDevBoard);
diff --git a/main/boards/lichuang-dev/config.h b/main/boards/lichuang-dev/config.h
index efaca110..c9f21cc2 100644
--- a/main/boards/lichuang-dev/config.h
+++ b/main/boards/lichuang-dev/config.h
@@ -5,7 +5,7 @@
 
 #define AUDIO_INPUT_SAMPLE_RATE  24000
 #define AUDIO_OUTPUT_SAMPLE_RATE 24000
-#define AUDIO_DEFAULT_OUTPUT_VOLUME 80
+#define AUDIO_DEFAULT_OUTPUT_VOLUME 90
 
 #define AUDIO_INPUT_REFERENCE    true
 
diff --git a/main/boards/lichuang-dev/lichuang_dev_board.cc b/main/boards/lichuang-dev/lichuang_dev_board.cc
new file mode 100644
index 00000000..1c55aa8f
--- /dev/null
+++ b/main/boards/lichuang-dev/lichuang_dev_board.cc
@@ -0,0 +1,20 @@
+#include "wifi_board.h"
+#include "box_audio_device.h"
+
+#include <esp_log.h>
+
+#define TAG "LichuangDevBoard"
+
+class LichuangDevBoard : public WifiBoard {
+public:
+    virtual void Initialize() override {
+        ESP_LOGI(TAG, "Initializing LichuangDevBoard");
+        WifiBoard::Initialize();
+    }
+
+    virtual AudioDevice* CreateAudioDevice() override {
+        return new BoxAudioDevice();
+    }
+};
+
+DECLARE_BOARD(LichuangDevBoard);
diff --git a/main/BoxAudioDevice.cc b/main/box_audio_device.cc
similarity index 99%
rename from main/BoxAudioDevice.cc
rename to main/box_audio_device.cc
index 5ee4eb38..4d08fc67 100644
--- a/main/BoxAudioDevice.cc
+++ b/main/box_audio_device.cc
@@ -1,5 +1,5 @@
-#include "BoxAudioDevice.h"
-#include "Board.h"
+#include "box_audio_device.h"
+#include "board.h"
 
 #include <esp_log.h>
 #include <cassert>
diff --git a/main/BoxAudioDevice.h b/main/box_audio_device.h
similarity index 97%
rename from main/BoxAudioDevice.h
rename to main/box_audio_device.h
index fd5cfe66..f24ebd4a 100644
--- a/main/BoxAudioDevice.h
+++ b/main/box_audio_device.h
@@ -1,7 +1,8 @@
 #ifndef _BOX_AUDIO_DEVICE_H
 #define _BOX_AUDIO_DEVICE_H
 
-#include "AudioDevice.h"
+#include "audio_device.h"
+
 #include <driver/i2c_master.h>
 #include <driver/i2s_tdm.h>
 #include <esp_codec_dev.h>
diff --git a/main/BuiltinLed.cc b/main/builtin_led.cc
similarity index 98%
rename from main/BuiltinLed.cc
rename to main/builtin_led.cc
index 2ef7b945..b4bb7078 100644
--- a/main/BuiltinLed.cc
+++ b/main/builtin_led.cc
@@ -1,5 +1,6 @@
-#include "BuiltinLed.h"
-#include "Board.h"
+#include "builtin_led.h"
+#include "board.h"
+
 #include <cstring>
 #include <esp_log.h>
 
diff --git a/main/BuiltinLed.h b/main/builtin_led.h
similarity index 100%
rename from main/BuiltinLed.h
rename to main/builtin_led.h
diff --git a/main/Button.cc b/main/button.cc
similarity index 99%
rename from main/Button.cc
rename to main/button.cc
index e18d8bc0..15dc3b80 100644
--- a/main/Button.cc
+++ b/main/button.cc
@@ -1,4 +1,5 @@
-#include "Button.h"
+#include "button.h"
+
 #include <esp_log.h>
 
 static const char* TAG = "Button";
diff --git a/main/Button.h b/main/button.h
similarity index 100%
rename from main/Button.h
rename to main/button.h
diff --git a/main/Display.cc b/main/display.cc
similarity index 99%
rename from main/Display.cc
rename to main/display.cc
index 35904834..1ab229ad 100644
--- a/main/Display.cc
+++ b/main/display.cc
@@ -6,9 +6,9 @@
 #include <string>
 #include <cstdlib>
 
-#include "Display.h"
-#include "Board.h"
-#include "Application.h"
+#include "display.h"
+#include "board.h"
+#include "application.h"
 
 #define TAG "Display"
 
diff --git a/main/Display.h b/main/display.h
similarity index 100%
rename from main/Display.h
rename to main/display.h
diff --git a/main/idf_component.yml b/main/idf_component.yml
index 2c08d9eb..8563a68c 100644
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -1,8 +1,8 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  78/esp-wifi-connect: "~1.2.0"
-  78/esp-opus-encoder: "~1.0.2"
-  78/esp-ml307: "~1.3.0"
+  78/esp-wifi-connect: "~1.3.0"
+  78/esp-opus-encoder: "~1.1.0"
+  78/esp-ml307: "~1.4.0"
   espressif/led_strip: "^2.4.1"
   espressif/esp_codec_dev: "^1.3.1"
   espressif/esp-sr: "^1.9.0"
diff --git a/main/main.cc b/main/main.cc
index 9ac9f70a..d726c5d2 100755
--- a/main/main.cc
+++ b/main/main.cc
@@ -5,8 +5,8 @@
 #include <driver/gpio.h>
 #include <esp_event.h>
 
-#include "Application.h"
-#include "SystemInfo.h"
+#include "application.h"
+#include "system_info.h"
 
 #define TAG "main"
 
diff --git a/main/Ml307Board.cc b/main/ml307_board.cc
similarity index 96%
rename from main/Ml307Board.cc
rename to main/ml307_board.cc
index 69072990..08125a33 100644
--- a/main/Ml307Board.cc
+++ b/main/ml307_board.cc
@@ -1,11 +1,11 @@
-#include "Ml307Board.h"
-#include "Application.h"
+#include "ml307_board.h"
+#include "application.h"
 
 #include <esp_log.h>
-#include <Ml307Http.h>
-#include <Ml307SslTransport.h>
-#include <WebSocket.h>
 #include <esp_timer.h>
+#include <ml307_http.h>
+#include <ml307_ssl_transport.h>
+#include <web_socket.h>
 
 static const char *TAG = "Ml307Board";
 
diff --git a/main/Ml307Board.h b/main/ml307_board.h
similarity index 92%
rename from main/Ml307Board.h
rename to main/ml307_board.h
index 0ad71983..bfb5a30b 100644
--- a/main/Ml307Board.h
+++ b/main/ml307_board.h
@@ -1,8 +1,8 @@
 #ifndef ML307_BOARD_H
 #define ML307_BOARD_H
 
-#include "Board.h"
-#include <Ml307AtModem.h>
+#include "board.h"
+#include <ml307_at_modem.h>
 
 class Ml307Board : public Board {
 protected:
diff --git a/main/FirmwareUpgrade.cc b/main/ota.cc
similarity index 90%
rename from main/FirmwareUpgrade.cc
rename to main/ota.cc
index 396b69cc..cefb660c 100644
--- a/main/FirmwareUpgrade.cc
+++ b/main/ota.cc
@@ -1,6 +1,6 @@
-#include "FirmwareUpgrade.h"
-#include "SystemInfo.h"
-#include "Board.h"
+#include "ota.h"
+#include "system_info.h"
+#include "board.h"
 
 #include <cJSON.h>
 #include <esp_log.h>
@@ -13,28 +13,28 @@
 #include <sstream>
 #include <algorithm>
 
-#define TAG "FirmwareUpgrade"
+#define TAG "Ota"
 
 
-FirmwareUpgrade::FirmwareUpgrade() {
+Ota::Ota() {
 }
 
-FirmwareUpgrade::~FirmwareUpgrade() {
+Ota::~Ota() {
 }
 
-void FirmwareUpgrade::SetCheckVersionUrl(std::string check_version_url) {
+void Ota::SetCheckVersionUrl(std::string check_version_url) {
     check_version_url_ = check_version_url;
 }
 
-void FirmwareUpgrade::SetHeader(const std::string& key, const std::string& value) {
+void Ota::SetHeader(const std::string& key, const std::string& value) {
     headers_[key] = value;
 }
 
-void FirmwareUpgrade::SetPostData(const std::string& post_data) {
+void Ota::SetPostData(const std::string& post_data) {
     post_data_ = post_data;
 }
 
-void FirmwareUpgrade::CheckVersion() {
+void Ota::CheckVersion() {
     std::string current_version = esp_app_get_description()->version;
     ESP_LOGI(TAG, "Current version: %s", current_version.c_str());
 
@@ -101,7 +101,7 @@ void FirmwareUpgrade::CheckVersion() {
     }
 }
 
-void FirmwareUpgrade::MarkCurrentVersionValid() {
+void Ota::MarkCurrentVersionValid() {
     auto partition = esp_ota_get_running_partition();
     if (strcmp(partition->label, "factory") == 0) {
         ESP_LOGI(TAG, "Running from factory partition, skipping");
@@ -121,7 +121,7 @@ void FirmwareUpgrade::MarkCurrentVersionValid() {
     }
 }
 
-void FirmwareUpgrade::Upgrade(const std::string& firmware_url) {
+void Ota::Upgrade(const std::string& firmware_url) {
     ESP_LOGI(TAG, "Upgrading firmware from %s", firmware_url.c_str());
     esp_ota_handle_t update_handle = 0;
     auto update_partition = esp_ota_get_next_update_partition(NULL);
@@ -232,12 +232,12 @@ void FirmwareUpgrade::Upgrade(const std::string& firmware_url) {
     esp_restart();
 }
 
-void FirmwareUpgrade::StartUpgrade(std::function<void(int progress, size_t speed)> callback) {
+void Ota::StartUpgrade(std::function<void(int progress, size_t speed)> callback) {
     upgrade_callback_ = callback;
     Upgrade(firmware_url_);
 }
 
-std::vector<int> FirmwareUpgrade::ParseVersion(const std::string& version) {
+std::vector<int> Ota::ParseVersion(const std::string& version) {
     std::vector<int> versionNumbers;
     std::stringstream ss(version);
     std::string segment;
@@ -249,7 +249,7 @@ std::vector<int> FirmwareUpgrade::ParseVersion(const std::string& version) {
     return versionNumbers;
 }
 
-bool FirmwareUpgrade::IsNewVersionAvailable(const std::string& currentVersion, const std::string& newVersion) {
+bool Ota::IsNewVersionAvailable(const std::string& currentVersion, const std::string& newVersion) {
     std::vector<int> current = ParseVersion(currentVersion);
     std::vector<int> newer = ParseVersion(newVersion);
     
diff --git a/main/FirmwareUpgrade.h b/main/ota.h
similarity index 85%
rename from main/FirmwareUpgrade.h
rename to main/ota.h
index 1d9487fb..157ef179 100644
--- a/main/FirmwareUpgrade.h
+++ b/main/ota.h
@@ -1,14 +1,14 @@
-#ifndef _FIRMWARE_UPGRADE_H
-#define _FIRMWARE_UPGRADE_H
+#ifndef _OTA_H
+#define _OTA_H
 
 #include <functional>
 #include <string>
 #include <map>
 
-class FirmwareUpgrade {
+class Ota {
 public:
-    FirmwareUpgrade();
-    ~FirmwareUpgrade();
+    Ota();
+    ~Ota();
 
     void SetCheckVersionUrl(std::string check_version_url);
     void SetHeader(const std::string& key, const std::string& value);
@@ -32,4 +32,4 @@ private:
     bool IsNewVersionAvailable(const std::string& currentVersion, const std::string& newVersion);
 };
 
-#endif // _FIRMWARE_UPGRADE_H
+#endif // _OTA_H
diff --git a/main/SystemInfo.cc b/main/system_info.cc
similarity index 99%
rename from main/SystemInfo.cc
rename to main/system_info.cc
index c2462590..10778caa 100644
--- a/main/SystemInfo.cc
+++ b/main/system_info.cc
@@ -1,4 +1,5 @@
-#include "SystemInfo.h"
+#include "system_info.h"
+
 #include <freertos/task.h>
 #include <esp_log.h>
 #include <esp_flash.h>
diff --git a/main/SystemInfo.h b/main/system_info.h
similarity index 100%
rename from main/SystemInfo.h
rename to main/system_info.h
diff --git a/main/SystemReset.cc b/main/system_reset.cc
similarity index 98%
rename from main/SystemReset.cc
rename to main/system_reset.cc
index bb206c8c..f7734f86 100644
--- a/main/SystemReset.cc
+++ b/main/system_reset.cc
@@ -1,4 +1,5 @@
-#include "SystemReset.h"
+#include "system_reset.h"
+
 #include <esp_log.h>
 #include <nvs_flash.h>
 #include <driver/gpio.h>
diff --git a/main/SystemReset.h b/main/system_reset.h
similarity index 100%
rename from main/SystemReset.h
rename to main/system_reset.h
diff --git a/main/WakeWordDetect.cc b/main/wake_word_detect.cc
similarity index 99%
rename from main/WakeWordDetect.cc
rename to main/wake_word_detect.cc
index 582c02b4..c120fed6 100644
--- a/main/WakeWordDetect.cc
+++ b/main/wake_word_detect.cc
@@ -1,10 +1,10 @@
+#include "wake_word_detect.h"
+#include "application.h"
+
 #include <esp_log.h>
 #include <model_path.h>
 #include <arpa/inet.h>
 
-#include "WakeWordDetect.h"
-#include "Application.h"
-
 #define DETECTION_RUNNING_EVENT 1
 #define WAKE_WORD_ENCODED_EVENT 2
 
diff --git a/main/WakeWordDetect.h b/main/wake_word_detect.h
similarity index 100%
rename from main/WakeWordDetect.h
rename to main/wake_word_detect.h
index 143f7ebc..fdf13c83 100644
--- a/main/WakeWordDetect.h
+++ b/main/wake_word_detect.h
@@ -1,13 +1,13 @@
 #ifndef WAKE_WORD_DETECT_H
 #define WAKE_WORD_DETECT_H
 
-#include <esp_afe_sr_models.h>
-#include <esp_nsn_models.h>
-
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include <freertos/event_groups.h>
 
+#include <esp_afe_sr_models.h>
+#include <esp_nsn_models.h>
+
 #include <list>
 #include <string>
 #include <vector>
diff --git a/main/WifiBoard.cc b/main/wifi_board.cc
similarity index 92%
rename from main/WifiBoard.cc
rename to main/wifi_board.cc
index b990c773..3fc405e7 100644
--- a/main/WifiBoard.cc
+++ b/main/wifi_board.cc
@@ -1,18 +1,19 @@
-#include "WifiBoard.h"
-#include "Application.h"
-#include "WifiStation.h"
-#include "WifiConfigurationAp.h"
-#include "SystemInfo.h"
-#include "BuiltinLed.h"
+#include "wifi_board.h"
+#include "application.h"
+#include "system_info.h"
+#include "builtin_led.h"
 
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
-#include <EspHttp.h>
-#include <TcpTransport.h>
-#include <TlsTransport.h>
-#include <WebSocket.h>
+#include <esp_http.h>
+#include <tcp_transport.h>
+#include <tls_transport.h>
+#include <web_socket.h>
 #include <esp_log.h>
 
+#include <wifi_station.h>
+#include <wifi_configuration_ap.h>
+
 static const char *TAG = "WifiBoard";
 
 static std::string rssi_to_string(int rssi) {
diff --git a/main/WifiBoard.h b/main/wifi_board.h
similarity index 96%
rename from main/WifiBoard.h
rename to main/wifi_board.h
index f6641095..88145fdd 100644
--- a/main/WifiBoard.h
+++ b/main/wifi_board.h
@@ -1,7 +1,7 @@
 #ifndef WIFI_BOARD_H
 #define WIFI_BOARD_H
 
-#include "Board.h"
+#include "board.h"
 
 class WifiBoard : public Board {
 protected: