diff --git a/getter/os2_32/DIR.H b/getter/os2_32/DIR.H
index bfec6c5..d07de94 100644
--- a/getter/os2_32/DIR.H
+++ b/getter/os2_32/DIR.H
@@ -29,8 +29,8 @@ Contains directory definitions
 Copyright (C) 2011-2020 Natalia Portillo
 *****************************************************************************/
 
-#ifndef DIC_FSTESTER_GETTER_OS2_DIR_H
-#define DIC_FSTESTER_GETTER_OS2_DIR_H
+#ifndef AARU_FSTESTER_GETTER_OS2_DIR_H
+#define AARU_FSTESTER_GETTER_OS2_DIR_H
 
 int GetAllInDir();
 
diff --git a/getter/os2_32/EA.H b/getter/os2_32/EA.H
index b0bb9bf..6a53734 100644
--- a/getter/os2_32/EA.H
+++ b/getter/os2_32/EA.H
@@ -29,8 +29,8 @@ Contains extended attribute definitions
 Copyright (C) 2011-2020 Natalia Portillo
 *****************************************************************************/
 
-#ifndef DIC_FSTESTER_GETTER_OS2_EA_H
-#define DIC_FSTESTER_GETTER_OS2_EA_H
+#ifndef AARU_FSTESTER_GETTER_OS2_EA_H
+#define AARU_FSTESTER_GETTER_OS2_EA_H
 
 #ifndef max
 #define max(a, b) ((a) < (b) ? (b) : (a))
diff --git a/getter/os2_32/MAIN.C b/getter/os2_32/MAIN.C
index 0d8d4e7..2583f3d 100644
--- a/getter/os2_32/MAIN.C
+++ b/getter/os2_32/MAIN.C
@@ -38,8 +38,8 @@ Copyright (C) 2011-2020 Natalia Portillo
 int main()
 {
     ULONG eaCounter = 0;
-    printf("Aaru Filesystem Tester (Getter) for OS/2 %s\n", DIC_FSTESTER_VERSION);
-    printf("%s\n", DIC_COPYRIGHT);
+    printf("Aaru Filesystem Tester (Getter) for OS/2 %s\n", AARU_FSTESTER_VERSION);
+    printf("%s\n", AARU_COPYRIGHT);
 
     return GetAllInDir("C:", &eaCounter);
 }
diff --git a/getter/os2_32/MAIN.H b/getter/os2_32/MAIN.H
index 7b5a580..1806c49 100644
--- a/getter/os2_32/MAIN.H
+++ b/getter/os2_32/MAIN.H
@@ -29,10 +29,10 @@ Contains global definitions
 Copyright (C) 2011-2020 Natalia Portillo
 *****************************************************************************/
 
-#ifndef DIC_FSTESTER_GETTER_OS2_MAIN_H
-#define DIC_FSTESTER_GETTER_OS2_MAIN_H
+#ifndef AARU_FSTESTER_GETTER_OS2_MAIN_H
+#define AARU_FSTESTER_GETTER_OS2_MAIN_H
 
-#define DIC_FSTESTER_VERSION "0.1"
-#define DIC_COPYRIGHT "Copyright (C) 2011-2020 Natalia Portillo"
+#define AARU_FSTESTER_VERSION "0.1"
+#define AARU_COPYRIGHT "Copyright (C) 2011-2020 Natalia Portillo"
 
 #endif
diff --git a/setter/consts.h b/setter/consts.h
index ea9b6c2..5b05de9 100644
--- a/setter/consts.h
+++ b/setter/consts.h
@@ -29,8 +29,8 @@ Constants
 Copyright (C) 2011-2020 Natalia Portillo
 *****************************************************************************/
 
-#ifndef DIC_FSTESTER_SETTER_CONSTS_H
-#define DIC_FSTESTER_SETTER_CONSTS_H
+#ifndef AARU_FSTESTER_SETTER_CONSTS_H
+#define AARU_FSTESTER_SETTER_CONSTS_H
 
 static const char *filenames[] = {
     "FILNAM",
diff --git a/setter/defs.h b/setter/defs.h
index 8c4497d..7648275 100644
--- a/setter/defs.h
+++ b/setter/defs.h
@@ -29,8 +29,8 @@ Contains common definitions
 Copyright (C) 2011-2020 Natalia Portillo
 *****************************************************************************/
 
-#ifndef DIC_FSTESTER_SETTER_DEFS_H
-#define DIC_FSTESTER_SETTER_DEFS_H
+#ifndef AARU_FSTESTER_SETTER_DEFS_H
+#define AARU_FSTESTER_SETTER_DEFS_H
 
 #include <stddef.h>
 
diff --git a/setter/dos.h b/setter/dos.h
index 444bec3..3236482 100644
--- a/setter/dos.h
+++ b/setter/dos.h
@@ -31,8 +31,8 @@ Copyright (C) 2011-2020 Natalia Portillo
 
 #if defined(__DOS__) || defined (MSDOS)
 
-#ifndef DIC_FSTESTER_SETTER_DOS_H
-#define DIC_FSTESTER_SETTER_DOS_H
+#ifndef AARU_FSTESTER_SETTER_DOS_H
+#define AARU_FSTESTER_SETTER_DOS_H
 
 #pragma pack(__push, 1)
 
diff --git a/setter/dosos2.h b/setter/dosos2.h
index 2fbfcc6..7d31811 100644
--- a/setter/dosos2.h
+++ b/setter/dosos2.h
@@ -31,8 +31,8 @@ Copyright (C) 2011-2020 Natalia Portillo
 
 #if defined(__OS2__) || defined(__os2__) || defined(__DOS__) || defined(MSDOS)
 
-#ifndef DIC_FSTESTER_SETTER_DOSOS2_H
-#define DIC_FSTESTER_SETTER_DOSOS2_H
+#ifndef AARU_FSTESTER_SETTER_DOSOS2_H
+#define AARU_FSTESTER_SETTER_DOSOS2_H
 
 const char *archivedAttributeText = "This file has the archived attribute set.\n";
 const char *systemAttributeText   = "This file has the system attribute set.\n";
diff --git a/setter/macos.h b/setter/macos.h
index 1164140..cd22a54 100644
--- a/setter/macos.h
+++ b/setter/macos.h
@@ -31,8 +31,8 @@ Copyright (C) 2011-2020 Natalia Portillo
 
 #if defined(macintosh)
 
-#ifndef DIC_FSTESTER_SETTER_MACINTOSH_H
-#define DIC_FSTESTER_SETTER_MACINTOSH_H
+#ifndef AARU_FSTESTER_SETTER_MACINTOSH_H
+#define AARU_FSTESTER_SETTER_MACINTOSH_H
 
 #include <MacTypes.h>
 
diff --git a/setter/main.c b/setter/main.c
index 340b0be..d495006 100644
--- a/setter/main.c
+++ b/setter/main.c
@@ -49,8 +49,8 @@ int main(int argc, char **argv)
     argc = ccommand(&argv);
 #endif
 
-    printf("Aaru Filesystem Tester (Setter) %s\n", DIC_FSTESTER_VERSION);
-    printf("%s\n", DIC_COPYRIGHT);
+    printf("Aaru Filesystem Tester (Setter) %s\n", AARU_FSTESTER_VERSION);
+    printf("%s\n", AARU_COPYRIGHT);
 
     printf("Running in %s (%s)\n", OS_NAME, OS_ARCH);
     printf("\n");
diff --git a/setter/main.h b/setter/main.h
index a18cd96..b359567 100644
--- a/setter/main.h
+++ b/setter/main.h
@@ -29,11 +29,11 @@ Contains global definitions
 Copyright (C) 2011-2020 Natalia Portillo
 *****************************************************************************/
 
-#ifndef DIC_FSTESTER_GETTER_MAIN_H
-#define DIC_FSTESTER_GETTER_MAIN_H
+#ifndef AARU_FSTESTER_GETTER_MAIN_H
+#define AARU_FSTESTER_GETTER_MAIN_H
 
-#define DIC_FSTESTER_VERSION "4.5.99.1663"
-#define DIC_COPYRIGHT "Copyright (C) 2011-2020 Natalia Portillo"
+#define AARU_FSTESTER_VERSION "4.5.99.1663"
+#define AARU_COPYRIGHT "Copyright (C) 2011-2020 Natalia Portillo"
 
 #if defined(__alpha__) || defined(_M_ALPHA)
 #define OS_ARCH "axp"
diff --git a/setter/os2_16.h b/setter/os2_16.h
index 70b91f4..ab0f512 100644
--- a/setter/os2_16.h
+++ b/setter/os2_16.h
@@ -30,8 +30,8 @@ Copyright (C) 2011-2020 Natalia Portillo
 *****************************************************************************/
 
 #if(defined(__OS2__) || defined(__os2__)) && (defined(__I86__) || defined(__i86__) || defined(_M_I86))
-#ifndef DIC_FSTESTER_SETTER_OS2_16_H
-#define DIC_FSTESTER_SETTER_OS2_16_H
+#ifndef AARU_FSTESTER_SETTER_OS2_16_H
+#define AARU_FSTESTER_SETTER_OS2_16_H
 
 /* Information level types (defins method of query) */
 #define FSAIL_QUERYNAME 1 /* Return data for a Drive or Device */
diff --git a/setter/win32.h b/setter/win32.h
index e0c0080..1493110 100644
--- a/setter/win32.h
+++ b/setter/win32.h
@@ -32,8 +32,8 @@ Copyright (C) 2011-2020 Natalia Portillo
 #if defined(__WINDOWS__) || defined(__TOS_WIN__) || defined(__WIN32__) || defined(_WIN64) || defined(_WIN32) ||        \
     defined(__NT__)
 
-#ifndef DIC_FSTESTER_SETTER_WIN32_H
-#define DIC_FSTESTER_SETTER_WIN32_H
+#ifndef AARU_FSTESTER_SETTER_WIN32_H
+#define AARU_FSTESTER_SETTER_WIN32_H
 
 #ifndef VER_PLATFORM_WIN32s
 #define VER_PLATFORM_WIN32s 0