diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index 80f60c3..a9bf9f4 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -12,7 +12,7 @@
 #include "TaskDisplay.h"
 #include "TaskEth.h"
 #include "TaskFTP.h"
-#include "TaskLora.h"
+#include "TaskModem.h"
 #include "TaskNTP.h"
 #include "TaskOTA.h"
 #include "TaskWifi.h"
@@ -81,7 +81,7 @@ void setup() {
 
   LoRaSystem = std::shared_ptr<System>(new System(boardConfig, userConfig));
   LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new DisplayTask()));
-  LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new LoraTask()));
+  LoRaSystem->getTaskManager().addTask(std::shared_ptr<Task>(new ModemTask()));
   if (boardConfig->Type == eETH_BOARD) {
     LoRaSystem->getTaskManager().addAlwaysRunTask(std::shared_ptr<Task>(new EthTask()));
   } else {
diff --git a/src/TaskLora.cpp b/src/TaskModem.cpp
similarity index 90%
rename from src/TaskLora.cpp
rename to src/TaskModem.cpp
index 04b6f83..6f9a8ba 100644
--- a/src/TaskLora.cpp
+++ b/src/TaskModem.cpp
@@ -3,16 +3,16 @@
 
 #include "Task.h"
 #include "TaskAprsIs.h"
-#include "TaskLora.h"
+#include "TaskModem.h"
 #include "project_configuration.h"
 
-LoraTask::LoraTask() : Task(TASK_LORA, TaskLora) {
+ModemTask::ModemTask() : Task(TASK_LORA, TaskLora) {
 }
 
-LoraTask::~LoraTask() {
+ModemTask::~ModemTask() {
 }
 
-bool LoraTask::setup(std::shared_ptr<System> system) {
+bool ModemTask::setup(std::shared_ptr<System> system) {
   _lora_aprs = std::shared_ptr<LoRa_APRS>(new LoRa_APRS(system->getBoardConfig()));
   if (!_lora_aprs->begin(_lora_aprs->getRxFrequency())) {
     logPrintlnE("Starting LoRa failed!");
@@ -33,7 +33,7 @@ bool LoraTask::setup(std::shared_ptr<System> system) {
   return true;
 }
 
-bool LoraTask::loop(std::shared_ptr<System> system) {
+bool ModemTask::loop(std::shared_ptr<System> system) {
   if (_lora_aprs->checkMessage()) {
     std::shared_ptr<APRSMessage> msg = _lora_aprs->getMessage();
     // msg->getAPRSBody()->setData(msg->getAPRSBody()->getData() + " 123");
diff --git a/src/TaskLora.h b/src/TaskModem.h
similarity index 83%
rename from src/TaskLora.h
rename to src/TaskModem.h
index b274f5b..84e125c 100644
--- a/src/TaskLora.h
+++ b/src/TaskModem.h
@@ -5,10 +5,10 @@
 #include <LoRa_APRS.h>
 #include <TaskManager.h>
 
-class LoraTask : public Task {
+class ModemTask : public Task {
 public:
-  LoraTask();
-  virtual ~LoraTask();
+  ModemTask();
+  virtual ~ModemTask();
 
   virtual bool setup(std::shared_ptr<System> system) override;
   virtual bool loop(std::shared_ptr<System> system) override;