diff --git a/lib/cli/nodeaddcommand.hpp b/lib/cli/nodeaddcommand.hpp
index a0288cbff..0dce9b746 100644
--- a/lib/cli/nodeaddcommand.hpp
+++ b/lib/cli/nodeaddcommand.hpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTADDCOMMAND_H
-#define AGENTADDCOMMAND_H
+#ifndef NODEADDCOMMAND_H
+#define NODEADDCOMMAND_H
 
 #include "cli/clicommand.hpp"
 
@@ -43,4 +43,4 @@ public:
 
 }
 
-#endif /* AGENTADDCOMMAND_H */
+#endif /* NODEADDCOMMAND_H */
diff --git a/lib/cli/nodelistcommand.hpp b/lib/cli/nodelistcommand.hpp
index 66c68293e..24537e26f 100644
--- a/lib/cli/nodelistcommand.hpp
+++ b/lib/cli/nodelistcommand.hpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTLISTCOMMAND_H
-#define AGENTLISTCOMMAND_H
+#ifndef NODELISTCOMMAND_H
+#define NODELISTCOMMAND_H
 
 #include "cli/clicommand.hpp"
 
@@ -44,4 +44,4 @@ public:
 
 }
 
-#endif /* AGENTLISTCOMMAND_H */
+#endif /* NODELISTCOMMAND_H */
diff --git a/lib/cli/noderemovecommand.hpp b/lib/cli/noderemovecommand.hpp
index e7a308075..9707672f8 100644
--- a/lib/cli/noderemovecommand.hpp
+++ b/lib/cli/noderemovecommand.hpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTREMOVECOMMAND_H
-#define AGENTREMOVECOMMAND_H
+#ifndef NODEREMOVECOMMAND_H
+#define NODEREMOVECOMMAND_H
 
 #include "cli/clicommand.hpp"
 
@@ -45,4 +45,4 @@ public:
 
 }
 
-#endif /* AGENTREMOVECOMMAND_H */
+#endif /* NODEREMOVECOMMAND_H */
diff --git a/lib/cli/nodesetcommand.hpp b/lib/cli/nodesetcommand.hpp
index 140a100da..ed3c34a01 100644
--- a/lib/cli/nodesetcommand.hpp
+++ b/lib/cli/nodesetcommand.hpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTSETCOMMAND_H
-#define AGENTSETCOMMAND_H
+#ifndef NODESETCOMMAND_H
+#define NODESETCOMMAND_H
 
 #include "cli/clicommand.hpp"
 
@@ -45,4 +45,4 @@ public:
 
 }
 
-#endif /* AGENTSETCOMMAND_H */
+#endif /* NODESETCOMMAND_H */
diff --git a/lib/cli/nodesetupcommand.hpp b/lib/cli/nodesetupcommand.hpp
index 83b80165b..c332e7ae7 100644
--- a/lib/cli/nodesetupcommand.hpp
+++ b/lib/cli/nodesetupcommand.hpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTSETUPCOMMAND_H
-#define AGENTSETUPCOMMAND_H
+#ifndef NODESETUPCOMMAND_H
+#define NODESETUPCOMMAND_H
 
 #include "cli/clicommand.hpp"
 
@@ -50,4 +50,4 @@ private:
 
 }
 
-#endif /* AGENTSETUPCOMMAND_H */
+#endif /* NODESETUPCOMMAND_H */
diff --git a/lib/cli/nodeupdateconfigcommand.hpp b/lib/cli/nodeupdateconfigcommand.hpp
index c2d873784..e71223206 100644
--- a/lib/cli/nodeupdateconfigcommand.hpp
+++ b/lib/cli/nodeupdateconfigcommand.hpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTUPDATECONFIGCOMMAND_H
-#define AGENTUPDATECONFIGCOMMAND_H
+#ifndef NODEUPDATECONFIGCOMMAND_H
+#define NODEUPDATECONFIGCOMMAND_H
 
 #include "cli/clicommand.hpp"
 
@@ -43,4 +43,4 @@ public:
 
 }
 
-#endif /* AGENTUPDATECONFIGCOMMAND_H */
+#endif /* NODEUPDATECONFIGCOMMAND_H */
diff --git a/lib/cli/nodeutility.hpp b/lib/cli/nodeutility.hpp
index 55d291c84..90eab3410 100644
--- a/lib/cli/nodeutility.hpp
+++ b/lib/cli/nodeutility.hpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTUTILITY_H
-#define AGENTUTILITY_H
+#ifndef NODEUTILITY_H
+#define NODEUTILITY_H
 
 #include "base/i2-base.hpp"
 #include "cli/i2-cli.hpp"
@@ -86,4 +86,4 @@ private:
 
 }
 
-#endif /* AGENTUTILITY_H */
+#endif /* NODEUTILITY_H */
diff --git a/lib/cli/nodewizardcommand.hpp b/lib/cli/nodewizardcommand.hpp
index e3cdeb456..fcd3905eb 100644
--- a/lib/cli/nodewizardcommand.hpp
+++ b/lib/cli/nodewizardcommand.hpp
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTWIZARDCOMMAND_H
-#define AGENTWIZARDCOMMAND_H
+#ifndef NODEWIZARDCOMMAND_H
+#define NODEWIZARDCOMMAND_H
 
 #include "cli/clicommand.hpp"
 
@@ -26,7 +26,7 @@ namespace icinga
 {
 
 /**
- * The "agent wizard" command.
+ * The "node wizard" command.
  *
  * @ingroup cli
  */
@@ -44,4 +44,4 @@ public:
 
 }
 
-#endif /* AGENTWIZARDCOMMAND_H */
+#endif /* NODEWIZARDCOMMAND_H */