diff --git a/checkm8_arduino/include/User_Setup.h b/checkm8_arduino/include/User_Setup.h
index ae56a77..0c4a1bd 100644
--- a/checkm8_arduino/include/User_Setup.h
+++ b/checkm8_arduino/include/User_Setup.h
@@ -1,4 +1,4 @@
-#ifndef IPWNDFU_REWRITE_C_USER_SETUP_H
-#define IPWNDFU_REWRITE_C_USER_SETUP_H
+#ifndef CHECKM8_ARDUINO_USER_SETUP_H
+#define CHECKM8_ARDUINO_USER_SETUP_H
 
-#endif //IPWNDFU_REWRITE_C_USER_SETUP_H
+#endif //CHECKM8_ARDUINO_USER_SETUP_H
diff --git a/checkm8_payloads/include/brfunc_aes.h b/checkm8_payloads/include/brfunc_aes.h
index 7c0137d..6af987c 100644
--- a/checkm8_payloads/include/brfunc_aes.h
+++ b/checkm8_payloads/include/brfunc_aes.h
@@ -1,5 +1,5 @@
-#ifndef IPWNDFU_REWRITE_C_BRFUNC_AES_H
-#define IPWNDFU_REWRITE_C_BRFUNC_AES_H
+#ifndef CHECKM8_TOOL_BRFUNC_AES_H
+#define CHECKM8_TOOL_BRFUNC_AES_H
 
 #include "brfunc_common.h"
 
@@ -15,4 +15,4 @@
 #define rAES_INT_STATUS             (long *) ADDR_AES_CONTROL
 #define rAES_CONTROL                (long *) ADDR_AES_STATUS
 
-#endif //IPWNDFU_REWRITE_C_BRFUNC_AES_H
+#endif //CHECKM8_TOOL_BRFUNC_AES_H
diff --git a/checkm8_payloads/include/brfunc_common.h b/checkm8_payloads/include/brfunc_common.h
index 62cd281..dc6e34a 100644
--- a/checkm8_payloads/include/brfunc_common.h
+++ b/checkm8_payloads/include/brfunc_common.h
@@ -1,5 +1,5 @@
-#ifndef IPWNDFU_REWRITE_C_BRFUNC_COMMON_H
-#define IPWNDFU_REWRITE_C_BRFUNC_COMMON_H
+#ifndef CHECKM8_TOOL_BRFUNC_COMMON_H
+#define CHECKM8_TOOL_BRFUNC_COMMON_H
 
 #include "checkm8_config.h"
 
@@ -32,4 +32,4 @@ typedef int (*BOOTROM_FUNC)();
 #error "Unsupported checkm8 platform"
 #endif
 
-#endif //IPWNDFU_REWRITE_C_BRFUNC_COMMON_H
+#endif //CHECKM8_TOOL_BRFUNC_COMMON_H
diff --git a/checkm8_payloads/include/brfunc_sep.h b/checkm8_payloads/include/brfunc_sep.h
index 9b8c5e7..1b80138 100644
--- a/checkm8_payloads/include/brfunc_sep.h
+++ b/checkm8_payloads/include/brfunc_sep.h
@@ -1,9 +1,9 @@
-#ifndef IPWNDFU_REWRITE_C_BRFUNC_SEP_H
-#define IPWNDFU_REWRITE_C_BRFUNC_SEP_H
+#ifndef CHECKM8_TOOL_BRFUNC_SEP_H
+#define CHECKM8_TOOL_BRFUNC_SEP_H
 
 #include "brfunc_common.h"
 
 #define DPA_SEEDED                  ((BOOTROM_FUNC) ADDR_DPA_SEEDED)
 #define SEP_CREATE_SEND_DPA_MESSAGE ((BOOTROM_FUNC) ADDR_SEND_DPA_MESSAGE)
 
-#endif //IPWNDFU_REWRITE_C_BRFUNC_SEP_H
+#endif //CHECKM8_TOOL_BRFUNC_SEP_H
diff --git a/checkm8_payloads/include/brfunc_timing.h b/checkm8_payloads/include/brfunc_timing.h
index e1093a8..b3eac15 100644
--- a/checkm8_payloads/include/brfunc_timing.h
+++ b/checkm8_payloads/include/brfunc_timing.h
@@ -1,5 +1,5 @@
-#ifndef IPWNDFU_REWRITE_C_BRFUNC_TIMING_H
-#define IPWNDFU_REWRITE_C_BRFUNC_TIMING_H
+#ifndef CHECKM8_TOOL_BRFUNC_TIMING_H
+#define CHECKM8_TOOL_BRFUNC_TIMING_H
 
 #include "brfunc_common.h"
 
@@ -7,4 +7,4 @@
 #define SYSTEM_TIME                 ((BOOTROM_FUNC) ADDR_SYSTEM_TIME)
 #define TIME_HAS_ELAPSED            ((BOOTROM_FUNC) ADDR_TIME_HAS_ELAPSED)
 
-#endif //IPWNDFU_REWRITE_C_BRFUNC_TIMING_H
+#endif //CHECKM8_TOOL_BRFUNC_TIMING_H
diff --git a/checkm8_payloads/include/util.h b/checkm8_payloads/include/util.h
index 69048a3..8c2c084 100644
--- a/checkm8_payloads/include/util.h
+++ b/checkm8_payloads/include/util.h
@@ -1,7 +1,7 @@
-#ifndef IPWNDFU_REWRITE_C_UTIL_H
-#define IPWNDFU_REWRITE_C_UTIL_H
+#ifndef CHECKM8_TOOL_UTIL_H
+#define CHECKM8_TOOL_UTIL_H
 
 #define PAYLOAD_SECTION __attribute__ ((section (".payload_text")))
 #define TEXT_SECTION __attribute__((section (".text")))
 
-#endif //IPWNDFU_REWRITE_C_UTIL_H
+#endif //CHECKM8_TOOL_UTIL_H
diff --git a/checkm8_remote/include/checkm8.h b/checkm8_remote/include/checkm8.h
index 7b7a622..8f54018 100644
--- a/checkm8_remote/include/checkm8.h
+++ b/checkm8_remote/include/checkm8.h
@@ -1,5 +1,5 @@
-#ifndef IPWNDFU_REWRITE_C_CHECKM8_H
-#define IPWNDFU_REWRITE_C_CHECKM8_H
+#ifndef CHECKM8_TOOL_CHECKM8_H
+#define CHECKM8_TOOL_CHECKM8_H
 
 #include "checkm8_config.h"
 
@@ -46,4 +46,4 @@ struct pwned_device
 struct pwned_device *exploit_device();
 void free_device(struct pwned_device *dev);
 
-#endif //IPWNDFU_REWRITE_C_CHECKM8_H
+#endif //CHECKM8_TOOL_CHECKM8_H
diff --git a/checkm8_remote/include/command.h b/checkm8_remote/include/command.h
index 6e99556..d19a67c 100644
--- a/checkm8_remote/include/command.h
+++ b/checkm8_remote/include/command.h
@@ -1,5 +1,5 @@
-#ifndef IPWNDFU_REWRITE_C_COMMAND_H
-#define IPWNDFU_REWRITE_C_COMMAND_H
+#ifndef CHECKM8_TOOL_COMMAND_H
+#define CHECKM8_TOOL_COMMAND_H
 
 #include "checkm8.h"
 
@@ -22,4 +22,4 @@ struct dev_cmd_resp *dev_write_memory(struct pwned_device *dev, long long addr,
 
 void free_dev_cmd_resp(struct dev_cmd_resp *resp);
 
-#endif //IPWNDFU_REWRITE_C_COMMAND_H
+#endif //CHECKM8_TOOL_COMMAND_H
diff --git a/checkm8_remote/include/payload.h b/checkm8_remote/include/payload.h
index 7ecf006..e5d0321 100644
--- a/checkm8_remote/include/payload.h
+++ b/checkm8_remote/include/payload.h
@@ -1,5 +1,5 @@
-#ifndef IPWNDFU_REWRITE_C_PAYLOAD_H
-#define IPWNDFU_REWRITE_C_PAYLOAD_H
+#ifndef CHECKM8_TOOL_PAYLOAD_H
+#define CHECKM8_TOOL_PAYLOAD_H
 
 #include "checkm8.h"
 
@@ -29,4 +29,4 @@ struct dev_cmd_resp *execute_payload(struct pwned_device *dev, PAYLOAD_T p, int
 struct dev_cmd_resp *read_payload(struct pwned_device *dev, long long addr, int len);
 struct dev_cmd_resp *write_payload(struct pwned_device *dev, long long addr, unsigned char *data, int len);
 
-#endif //IPWNDFU_REWRITE_C_PAYLOAD_H
+#endif //CHECKM8_TOOL_PAYLOAD_H
diff --git a/checkm8_remote/include/usb_helpers.h b/checkm8_remote/include/usb_helpers.h
index 6271f7c..7b3045c 100644
--- a/checkm8_remote/include/usb_helpers.h
+++ b/checkm8_remote/include/usb_helpers.h
@@ -1,5 +1,5 @@
-#ifndef IPWNDFU_REWRITE_C_LIBUSB_HELPERS_H
-#define IPWNDFU_REWRITE_C_LIBUSB_HELPERS_H
+#ifndef CHECKM8_TOOL_LIBUSB_HELPERS_H
+#define CHECKM8_TOOL_LIBUSB_HELPERS_H
 
 #include "checkm8.h"
 #define LIBUSB_MAX_PACKET_SIZE 0x800
@@ -42,4 +42,4 @@ int reset(struct pwned_device *dev);
 int serial_descriptor(struct pwned_device *dev, unsigned char *serial_buf, int len);
 
 
-#endif //IPWNDFU_REWRITE_C_LIBUSB_HELPERS_H
+#endif //CHECKM8_TOOL_LIBUSB_HELPERS_H
diff --git a/include/checkm8_config.h b/include/checkm8_config.h
index 3707157..a25a990 100644
--- a/include/checkm8_config.h
+++ b/include/checkm8_config.h
@@ -1,5 +1,5 @@
-#ifndef IPWNDFU_REWRITE_C_CHECKM8_CONFIG_H
-#define IPWNDFU_REWRITE_C_CHECKM8_CONFIG_H
+#ifndef CHECKM8_TOOL_CHECKM8_CONFIG_H
+#define CHECKM8_TOOL_CHECKM8_CONFIG_H
 
 //#define LIBUSB_LOGGING
 #define CHECKM8_LOGGING
@@ -13,4 +13,4 @@
 void checkm8_debug_indent(const char *format, ...);
 void checkm8_debug_block(const char *format, ...);
 
-#endif //IPWNDFU_REWRITE_C_CHECKM8_CONFIG_H
+#endif //CHECKM8_TOOL_CHECKM8_CONFIG_H