diff --git a/README.md b/README.md
index 285cb45..5f9f602 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-DiscImageChef Filesystem Testers
+Aaru Filesystem Testers
 ================================
 
 This folder contains source code for snippets designed to retrieve special features
 (e.g. extended attributes) from all files on installed volumes (getters) as well as snippets
 designed to create known files with all features specific to an
 operating system / filesystem combination to reverse engineer them and/or test
-DiscImageChef filesystem implementations.
\ No newline at end of file
+Aaru filesystem implementations.
\ No newline at end of file
diff --git a/getter/README.md b/getter/README.md
index ab08d6b..e954c2f 100644
--- a/getter/README.md
+++ b/getter/README.md
@@ -1,4 +1,4 @@
-DiscImageChef Filesystem Testers: Getters
+Aaru Filesystem Testers: Getters
 =========================================
 
 This folder contains snippets designed to retrieve special features from files on a volume
diff --git a/getter/os2_32/README.md b/getter/os2_32/README.md
index 0c1b1c1..ecc2a09 100644
--- a/getter/os2_32/README.md
+++ b/getter/os2_32/README.md
@@ -1,4 +1,4 @@
-DiscImageChef 32-bit OS/2 Filesystem Getter
+Aaru 32-bit OS/2 Filesystem Getter
 ===========================================
 This snippet is designed to retrieve all Extended Attributes from all files in the `C:`
 volume, saving them as a set of COUNTER.EA files in executing directory.
diff --git a/setter/macos.c b/setter/macos.c
index 909af1d..ca24704 100644
--- a/setter/macos.c
+++ b/setter/macos.c
@@ -615,7 +615,7 @@ void FileAttributes(const char *path)
             wRc                  = FSWrite(refFile, &count, dicText);
             cRc                  = FSClose(refFile);
             finderInfo.fdType    = ftGenericDocumentPC;
-            finderInfo.fdCreator = ostDiscImageChef;
+            finderInfo.fdCreator = ostAaru;
             rc                   = HSetFInfo(refNum, dirId, "\pDIC", &finderInfo);
         }
     }
@@ -931,7 +931,7 @@ void ResourceFork(const char *path)
             wRc                  = FSWrite(refFile, &count, rsrcText);
             cRc                  = FSClose(refFile);
             finderInfo.fdType    = ftGenericDocumentPC;
-            finderInfo.fdCreator = ostDiscImageChef;
+            finderInfo.fdCreator = ostAaru;
             finderInfo.fdFlags   = kHasCustomIcon;
             rc                   = HSetFInfo(refNum, dirId, "\pICON", &finderInfo);
         }
@@ -962,7 +962,7 @@ void ResourceFork(const char *path)
             wRc                  = FSWrite(refFile, &count, rsrcText);
             cRc                  = FSClose(refFile);
             finderInfo.fdType    = ftPICTFile;
-            finderInfo.fdCreator = ostDiscImageChef;
+            finderInfo.fdCreator = ostAaru;
             rc                   = HSetFInfo(refNum, dirId, "\pPICT", &finderInfo);
         }
     }
@@ -992,7 +992,7 @@ void ResourceFork(const char *path)
             wRc                  = FSWrite(refFile, &count, rsrcText);
             cRc                  = FSClose(refFile);
             finderInfo.fdType    = ftGenericDocumentPC;
-            finderInfo.fdCreator = ostDiscImageChef;
+            finderInfo.fdCreator = ostAaru;
             rc                   = HSetFInfo(refNum, dirId, "\pVERSION", &finderInfo);
         }
     }
@@ -1038,7 +1038,7 @@ void ResourceFork(const char *path)
             wRc                  = FSWrite(refFile, &count, rsrcText);
             cRc                  = FSClose(refFile);
             finderInfo.fdType    = ftPICTFile;
-            finderInfo.fdCreator = ostDiscImageChef;
+            finderInfo.fdCreator = ostAaru;
             finderInfo.fdFlags   = kHasCustomIcon;
             rc                   = HSetFInfo(refNum, dirId, "\pALL", &finderInfo);
         }
@@ -1956,7 +1956,7 @@ static pascal OSErr
 
     aliasRefnum = FSpOpenResFile(aliasFile, fsRdWrPerm);
 
-    AddResource((Handle)alias, rAliasType, 0, "\pDiscImageChef alias");
+    AddResource((Handle)alias, rAliasType, 0, "\pAaru alias");
     err = ResError();
 
     CloseResFile(aliasRefnum);
diff --git a/setter/macos.h b/setter/macos.h
index cd22a54..e22ce7d 100644
--- a/setter/macos.h
+++ b/setter/macos.h
@@ -78,7 +78,7 @@ const char *rsrcText          = "This file has a custom icon, a version, and a p
 enum
 {
     gestaltMacOSCompatibilityBoxAttr = FOUR_CHAR_CODE('bbox'),
-    ostDiscImageChef                 = FOUR_CHAR_CODE('dic '),
+    ostAaru                          = FOUR_CHAR_CODE('dic '),
     ostSimpleText                    = FOUR_CHAR_CODE('ttxt'),
     ostUnknown                       = FOUR_CHAR_CODE('????'),
     rtIcons                          = FOUR_CHAR_CODE('icns'),