diff --git a/src/demo/NodeTest.h b/src/demo/NodeTest.h
index 2a51d72..6731597 100644
--- a/src/demo/NodeTest.h
+++ b/src/demo/NodeTest.h
@@ -1,16 +1,16 @@
-#ifndef NODE_TEST_H
-#define NODE_TEST_H
+#ifndef PATRIX_NODE_TEST_H
+#define PATRIX_NODE_TEST_H
 
 #include <patrix/display/DisplayMatrix.h>
-#include <patrix/node/Node.h>
+#include <patrix/node/PatrixNode.h>
 
 DisplayMatrix<32, 8> display;
 
-class NodeTest final : public Node {
+class NodeTest final : public PatrixNode {
 
 public:
 
-  explicit NodeTest() : Node(true, true, true) {
+  explicit NodeTest() : PatrixNode(true, true, true) {
     //
   }
 
diff --git a/src/demo/main.cpp b/src/demo/main.cpp
index d91b6dc..ce126a5 100644
--- a/src/demo/main.cpp
+++ b/src/demo/main.cpp
@@ -2,6 +2,6 @@
 
 auto node = NodeTest();
 
-Node &patrixGetNode() {
+PatrixNode &patrixGetNode() {
   return node;
 }
diff --git a/src/patrix/Patrix.h b/src/patrix/Patrix.h
index e090cd0..20c32af 100644
--- a/src/patrix/Patrix.h
+++ b/src/patrix/Patrix.h
@@ -12,6 +12,6 @@
 #include <patrix/core/mqtt.h>
 #include <patrix/core/system.h>
 #include <patrix/core/wifi.h>
-#include <patrix/node/Node.h>
+#include <patrix/node/PatrixNode.h>
 
 #endif
diff --git a/src/patrix/core/boot.cpp b/src/patrix/core/boot.cpp
index ff21fc9..c59fe61 100644
--- a/src/patrix/core/boot.cpp
+++ b/src/patrix/core/boot.cpp
@@ -2,7 +2,7 @@
 #include <patrix/core/clock.h>
 #include <patrix/core/log.h>
 #include <patrix/core/wifi.h>
-#include <patrix/node/Node.h>
+#include <patrix/node/PatrixNode.h>
 
 #include "esp32/rom/rtc.h"
 
diff --git a/src/patrix/core/http.cpp b/src/patrix/core/http.cpp
index 8d8394f..b5772c2 100644
--- a/src/patrix/core/http.cpp
+++ b/src/patrix/core/http.cpp
@@ -1,7 +1,7 @@
 #include <ESPAsyncWebServer.h>
 #include <patrix/core/log.h>
 #include <patrix/core/system.h>
-#include <patrix/node/Node.h>
+#include <patrix/node/PatrixNode.h>
 
 AsyncWebServer server(80);
 
diff --git a/src/patrix/node/Node.cpp b/src/patrix/node/Node.cpp
deleted file mode 100644
index d899cf7..0000000
--- a/src/patrix/node/Node.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <patrix/node/Node.h>
-
-// ReSharper disable once CppUseAuto
-Node patrixNode = patrixGetNode();
diff --git a/src/patrix/node/PatrixNode.cpp b/src/patrix/node/PatrixNode.cpp
new file mode 100644
index 0000000..8694fbc
--- /dev/null
+++ b/src/patrix/node/PatrixNode.cpp
@@ -0,0 +1,4 @@
+#include <patrix/node/PatrixNode.h>
+
+// ReSharper disable once CppUseAuto
+PatrixNode patrixNode = patrixGetNode();
diff --git a/src/patrix/node/Node.h b/src/patrix/node/PatrixNode.h
similarity index 64%
rename from src/patrix/node/Node.h
rename to src/patrix/node/PatrixNode.h
index d010788..6793830 100644
--- a/src/patrix/node/Node.h
+++ b/src/patrix/node/PatrixNode.h
@@ -1,9 +1,9 @@
-#ifndef NODE_H
-#define NODE_H
+#ifndef PATRIX_NODE_H
+#define PATRIX_NODE_H
 
 #include <ESPAsyncWebServer.h>
 
-class Node {
+class PatrixNode {
 
 public:
 
@@ -13,14 +13,14 @@ public:
 
   const bool waitForClock;
 
-  explicit Node(const bool waitForWiFi, const bool waitForOTA, const bool waitForClock)
+  explicit PatrixNode(const bool waitForWiFi, const bool waitForOTA, const bool waitForClock)
     : waitForWiFi(waitForWiFi),
       waitForOTA(waitForOTA),
       waitForClock(waitForClock) {
     //
   }
 
-  virtual ~Node() = default;
+  virtual ~PatrixNode() = default;
 
   virtual void setup() {}
 
@@ -30,8 +30,8 @@ public:
 
 };
 
-extern Node patrixNode;
+extern PatrixNode patrixNode;
 
-Node& patrixGetNode();
+PatrixNode& patrixGetNode();
 
 #endif