diff --git a/src/plugins/input/InputBroker.cpp b/src/input/InputBroker.cpp
similarity index 62%
rename from src/plugins/input/InputBroker.cpp
rename to src/input/InputBroker.cpp
index a71da5778..85e5a087f 100644
--- a/src/plugins/input/InputBroker.cpp
+++ b/src/input/InputBroker.cpp
@@ -6,9 +6,9 @@ InputBroker::InputBroker()
 {
 };
 
-void InputBroker::registerOrigin(Observable<const InputEvent *> *origin)
+void InputBroker::registerSource(Observable<const InputEvent *> *source)
 {
-    this->inputEventObserver.observe(origin);
+    this->inputEventObserver.observe(source);
 }
 
 int InputBroker::handleInputEvent(const InputEvent *event)
diff --git a/src/plugins/input/InputBroker.h b/src/input/InputBroker.h
similarity index 84%
rename from src/plugins/input/InputBroker.h
rename to src/input/InputBroker.h
index a79855131..e75b0c407 100644
--- a/src/plugins/input/InputBroker.h
+++ b/src/input/InputBroker.h
@@ -2,7 +2,7 @@
 #include "Observer.h"
 
 typedef struct _InputEvent {
-    const char* origin;
+    const char* source;
     char inputEvent;
 } InputEvent;
 class InputBroker :
@@ -13,7 +13,7 @@ class InputBroker :
 
   public:
     InputBroker();
-    void registerOrigin(Observable<const InputEvent *> *origin);
+    void registerSource(Observable<const InputEvent *> *source);
 
   protected:
     int handleInputEvent(const InputEvent *event);
diff --git a/src/plugins/input/RotaryEncoderInterruptBase.cpp b/src/input/RotaryEncoderInterruptBase.cpp
similarity index 99%
rename from src/plugins/input/RotaryEncoderInterruptBase.cpp
rename to src/input/RotaryEncoderInterruptBase.cpp
index 2186936e4..ba825080f 100644
--- a/src/plugins/input/RotaryEncoderInterruptBase.cpp
+++ b/src/input/RotaryEncoderInterruptBase.cpp
@@ -40,7 +40,7 @@ int32_t RotaryEncoderInterruptBase::runOnce()
 {
     InputEvent e;
     e.inputEvent = InputEventChar_NULL;
-    e.origin = this->_originName;
+    e.source = this->_originName;
 
     if (this->action == ROTARY_ACTION_PRESSED)
     {
diff --git a/src/plugins/input/RotaryEncoderInterruptBase.h b/src/input/RotaryEncoderInterruptBase.h
similarity index 100%
rename from src/plugins/input/RotaryEncoderInterruptBase.h
rename to src/input/RotaryEncoderInterruptBase.h
diff --git a/src/plugins/input/RotaryEncoderInterruptImpl1.cpp b/src/input/RotaryEncoderInterruptImpl1.cpp
similarity index 97%
rename from src/plugins/input/RotaryEncoderInterruptImpl1.cpp
rename to src/input/RotaryEncoderInterruptImpl1.cpp
index 1f1434ab4..e0e904a0d 100644
--- a/src/plugins/input/RotaryEncoderInterruptImpl1.cpp
+++ b/src/input/RotaryEncoderInterruptImpl1.cpp
@@ -34,7 +34,7 @@ void RotaryEncoderInterruptImpl1::init()
         RotaryEncoderInterruptImpl1::handleIntA,
         RotaryEncoderInterruptImpl1::handleIntB,
         RotaryEncoderInterruptImpl1::handleIntPressed);
-    inputBroker->registerOrigin(this);
+    inputBroker->registerSource(this);
 }
 
 void RotaryEncoderInterruptImpl1::handleIntA()
diff --git a/src/plugins/input/RotaryEncoderInterruptImpl1.h b/src/input/RotaryEncoderInterruptImpl1.h
similarity index 100%
rename from src/plugins/input/RotaryEncoderInterruptImpl1.h
rename to src/input/RotaryEncoderInterruptImpl1.h
diff --git a/src/plugins/CannedMessagePlugin.cpp b/src/plugins/CannedMessagePlugin.cpp
index 2107a8768..ba3cb02c9 100644
--- a/src/plugins/CannedMessagePlugin.cpp
+++ b/src/plugins/CannedMessagePlugin.cpp
@@ -82,10 +82,10 @@ int CannedMessagePlugin::handleInputEvent(const InputEvent *event)
 {
     if (
         (strlen(radioConfig.preferences.canned_message_plugin_allow_input_origin) > 0) &&
-        (strcmp(radioConfig.preferences.canned_message_plugin_allow_input_origin, event->origin) != 0) &&
+        (strcmp(radioConfig.preferences.canned_message_plugin_allow_input_origin, event->source) != 0) &&
         (strcmp(radioConfig.preferences.canned_message_plugin_allow_input_origin, "_any") != 0))
     {
-        // Event origin is not accepted.
+        // Event source is not accepted.
         return 0;
     }
 
diff --git a/src/plugins/Plugins.cpp b/src/plugins/Plugins.cpp
index 55c0fd84a..03ab1a8a0 100644
--- a/src/plugins/Plugins.cpp
+++ b/src/plugins/Plugins.cpp
@@ -1,4 +1,6 @@
 #include "configuration.h"
+#include "input/InputBroker.h"
+#include "input/RotaryEncoderInterruptImpl1.h"
 #include "plugins/ExternalNotificationPlugin.h"
 #include "plugins/NodeInfoPlugin.h"
 #include "plugins/PositionPlugin.h"
@@ -9,8 +11,6 @@
 #include "plugins/RoutingPlugin.h"
 #include "plugins/AdminPlugin.h"
 #include "plugins/CannedMessagePlugin.h"
-#include "plugins/input/InputBroker.h"
-#include "plugins/input/RotaryEncoderInterruptImpl1.h"
 #ifndef NO_ESP32
 #include "plugins/esp32/SerialPlugin.h"
 #include "plugins/esp32/EnvironmentalMeasurementPlugin.h"