diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f5366314..2026471c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -374,7 +374,7 @@ list(APPEND SOURCE_FILES
         DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c
         DisplayApp/Fonts/jetbrains_mono_bold_20.c
 
-        SystemTask/SystemTask.cpp
+        systemtask/SystemTask.cpp
         drivers/TwiMaster.cpp
         )
 
@@ -451,8 +451,8 @@ set(INCLUDE_FILES
         libs/date/includes/date/ptz.h
         libs/date/includes/date/tz_private.h
         DisplayApp/LittleVgl.h
-        SystemTask/SystemTask.h
-        SystemTask/SystemMonitor.h
+        systemtask/SystemTask.h
+        systemtask/SystemMonitor.h
         DisplayApp/Screens/Symbols.h
         drivers/TwiMaster.h
         )
diff --git a/src/SystemTask/SystemMonitor.h b/src/systemtask/SystemMonitor.h
similarity index 100%
rename from src/SystemTask/SystemMonitor.h
rename to src/systemtask/SystemMonitor.h
diff --git a/src/SystemTask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
similarity index 97%
rename from src/SystemTask/SystemTask.cpp
rename to src/systemtask/SystemTask.cpp
index 2070282b..24f688e2 100644
--- a/src/SystemTask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -46,7 +46,7 @@ void SystemTask::Start() {
 
 void SystemTask::Process(void *instance) {
   auto *app = static_cast<SystemTask *>(instance);
-  NRF_LOG_INFO("SystemTask task started!");
+  NRF_LOG_INFO("systemtask task started!");
   app->Work();
 }
 
@@ -123,7 +123,7 @@ void SystemTask::Work() {
           break;
         case Messages::GoToSleep:
           isGoingToSleep = true;
-          NRF_LOG_INFO("[SystemTask] Going to sleep");
+          NRF_LOG_INFO("[systemtask] Going to sleep");
           xTimerStop(idleTimer, 0);
           displayApp->PushMessage(Pinetime::Applications::DisplayApp::Messages::GoToSleep);
           break;
@@ -196,13 +196,13 @@ void SystemTask::Work() {
 void SystemTask::OnButtonPushed() {
   if(isGoingToSleep) return;
   if(!isSleeping) {
-    NRF_LOG_INFO("[SystemTask] Button pushed");
+    NRF_LOG_INFO("[systemtask] Button pushed");
     PushMessage(Messages::OnButtonEvent);
     displayApp->PushMessage(Pinetime::Applications::DisplayApp::Messages::ButtonPushed);
   }
   else {
     if(!isWakingUp) {
-      NRF_LOG_INFO("[SystemTask] Button pushed, waking up");
+      NRF_LOG_INFO("[systemtask] Button pushed, waking up");
       GoToRunning();
     }
   }
@@ -215,7 +215,7 @@ void SystemTask::GoToRunning() {
 
 void SystemTask::OnTouchEvent() {
   if(isGoingToSleep) return ;
-  NRF_LOG_INFO("[SystemTask] Touch event");
+  NRF_LOG_INFO("[systemtask] Touch event");
   if(!isSleeping) {
     PushMessage(Messages::OnTouchEvent);
     displayApp->PushMessage(Pinetime::Applications::DisplayApp::Messages::TouchEvent);
diff --git a/src/SystemTask/SystemTask.h b/src/systemtask/SystemTask.h
similarity index 100%
rename from src/SystemTask/SystemTask.h
rename to src/systemtask/SystemTask.h