diff --git a/archaaru-x86/efiboot/loader/entries/archiso-x86_64-cd.conf b/archaaru-x86/efiboot/loader/entries/archiso-x86_64-cd.conf
index dbd78d7..0440376 100644
--- a/archaaru-x86/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ b/archaaru-x86/efiboot/loader/entries/archiso-x86_64-cd.conf
@@ -1,4 +1,4 @@
-title   DiscImageChef's Arch Linux archiso x86_64 UEFI CD
+title   Aaru's Arch Linux archiso x86_64 UEFI CD
 linux   /EFI/archiso/vmlinuz.efi
 initrd  /EFI/archiso/intel_ucode.img
 initrd  /EFI/archiso/amd_ucode.img
diff --git a/archaaru-x86/efiboot/loader/entries/archiso-x86_64-usb.conf b/archaaru-x86/efiboot/loader/entries/archiso-x86_64-usb.conf
index fbbe8b7..1627da7 100644
--- a/archaaru-x86/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ b/archaaru-x86/efiboot/loader/entries/archiso-x86_64-usb.conf
@@ -1,4 +1,4 @@
-title   DiscImageChef's Arch Linux archiso x86_64 UEFI USB
+title   Aaru's Arch Linux archiso x86_64 UEFI USB
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz
 initrd  /%INSTALL_DIR%/boot/intel_ucode.img
 initrd  /%INSTALL_DIR%/boot/amd_ucode.img
diff --git a/archaaru-x86/packages.both b/archaaru-x86/packages.both
index 101b89d..2065567 100644
--- a/archaaru-x86/packages.both
+++ b/archaaru-x86/packages.both
@@ -36,7 +36,7 @@ darkhttpd
 ddrescue
 dhclient
 dialog
-discimagechef
+aaru
 dmidecode
 dmraid
 dnsmasq
diff --git a/archaaru-x86/pacman.conf b/archaaru-x86/pacman.conf
index 61d043e..483799e 100644
--- a/archaaru-x86/pacman.conf
+++ b/archaaru-x86/pacman.conf
@@ -100,6 +100,6 @@ Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
-[discimagechef]
-Server = file:///home/claunia/Development/DiscImageChef/archdic/repo
+[aaru]
+Server = file:///home/claunia/Development/Aaru/archdic/repo
 SigLevel = Optional TrustAll
diff --git a/archaaru-x86/syslinux/archiso_pxe.cfg b/archaaru-x86/syslinux/archiso_pxe.cfg
index 45a1127..6576bec 100644
--- a/archaaru-x86/syslinux/archiso_pxe.cfg
+++ b/archaaru-x86/syslinux/archiso_pxe.cfg
@@ -2,7 +2,7 @@ INCLUDE boot/syslinux/archiso_head.cfg
 
 LABEL arch32_nbd
 TEXT HELP
-Boot the DiscImageChef's Arch Linux (i686) live medium (Using NBD).
+Boot the Aaru's Arch Linux (i686) live medium (Using NBD).
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (i686) (NBD)
@@ -13,7 +13,7 @@ SYSAPPEND 3
 
 LABEL arch32_nfs
 TEXT HELP
-Boot the DiscImageChef's Arch Linux (i686) live medium (Using NFS).
+Boot the Aaru's Arch Linux (i686) live medium (Using NFS).
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (i686) (NFS)
@@ -24,7 +24,7 @@ SYSAPPEND 3
 
 LABEL arch32_http
 TEXT HELP
-Boot the DiscImageChef's Arch Linux (i686) live medium (Using HTTP).
+Boot the Aaru's Arch Linux (i686) live medium (Using HTTP).
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (i686) (HTTP)
diff --git a/archaaru-x86/syslinux/archiso_sys.cfg b/archaaru-x86/syslinux/archiso_sys.cfg
index fdaff42..6df81c0 100644
--- a/archaaru-x86/syslinux/archiso_sys.cfg
+++ b/archaaru-x86/syslinux/archiso_sys.cfg
@@ -2,7 +2,7 @@ INCLUDE boot/syslinux/archiso_head.cfg
 
 LABEL arch32
 TEXT HELP
-Boot the DiscImageChef's Arch Linux (i686) live medium.
+Boot the Aaru's Arch Linux (i686) live medium.
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (i686)
diff --git a/archaaru-x86_64/efiboot/loader/entries/archiso-x86_64-cd.conf b/archaaru-x86_64/efiboot/loader/entries/archiso-x86_64-cd.conf
index dbd78d7..0440376 100644
--- a/archaaru-x86_64/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ b/archaaru-x86_64/efiboot/loader/entries/archiso-x86_64-cd.conf
@@ -1,4 +1,4 @@
-title   DiscImageChef's Arch Linux archiso x86_64 UEFI CD
+title   Aaru's Arch Linux archiso x86_64 UEFI CD
 linux   /EFI/archiso/vmlinuz.efi
 initrd  /EFI/archiso/intel_ucode.img
 initrd  /EFI/archiso/amd_ucode.img
diff --git a/archaaru-x86_64/efiboot/loader/entries/archiso-x86_64-usb.conf b/archaaru-x86_64/efiboot/loader/entries/archiso-x86_64-usb.conf
index fbbe8b7..1627da7 100644
--- a/archaaru-x86_64/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ b/archaaru-x86_64/efiboot/loader/entries/archiso-x86_64-usb.conf
@@ -1,4 +1,4 @@
-title   DiscImageChef's Arch Linux archiso x86_64 UEFI USB
+title   Aaru's Arch Linux archiso x86_64 UEFI USB
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz
 initrd  /%INSTALL_DIR%/boot/intel_ucode.img
 initrd  /%INSTALL_DIR%/boot/amd_ucode.img
diff --git a/archaaru-x86_64/packages.both b/archaaru-x86_64/packages.both
new file mode 100644
index 0000000..e69de29
diff --git a/archaaru-x86_64/packages.x86_64 b/archaaru-x86_64/packages.x86_64
index 5f146e3..2f0a919 100644
--- a/archaaru-x86_64/packages.x86_64
+++ b/archaaru-x86_64/packages.x86_64
@@ -36,7 +36,7 @@ cvs
 ddrescue
 dhclient
 dialog
-discimagechef-git
+aaru-git
 dmidecode
 dmraid
 dnsmasq
diff --git a/archaaru-x86_64/pacman.conf b/archaaru-x86_64/pacman.conf
index f54eaf6..ec873ab 100644
--- a/archaaru-x86_64/pacman.conf
+++ b/archaaru-x86_64/pacman.conf
@@ -100,6 +100,6 @@ Include = /etc/pacman.d/mirrorlist
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
 
-[discimagechef]
-Server = file:///home/claunia/Development/DiscImageChef/archdic/repo
+[aaru]
+Server = file:///home/claunia/Development/Aaru/archdic/repo
 SigLevel = Optional TrustAll
diff --git a/archaaru-x86_64/syslinux/archiso_head.cfg b/archaaru-x86_64/syslinux/archiso_head.cfg
index 3438d68..50ebd05 100644
--- a/archaaru-x86_64/syslinux/archiso_head.cfg
+++ b/archaaru-x86_64/syslinux/archiso_head.cfg
@@ -1,6 +1,6 @@
 SERIAL 0 38400
 UI boot/syslinux/vesamenu.c32
-MENU TITLE DiscImageChef's Arch Linux
+MENU TITLE Aaru's Arch Linux
 MENU BACKGROUND boot/syslinux/splash.png
 
 MENU WIDTH 78
diff --git a/archaaru-x86_64/syslinux/archiso_pxe.cfg b/archaaru-x86_64/syslinux/archiso_pxe.cfg
index f0ebb81..e6d40a6 100644
--- a/archaaru-x86_64/syslinux/archiso_pxe.cfg
+++ b/archaaru-x86_64/syslinux/archiso_pxe.cfg
@@ -2,7 +2,7 @@ INCLUDE boot/syslinux/archiso_head.cfg
 
 LABEL arch64_nbd
 TEXT HELP
-Boot the DiscImageChef's Arch Linux (x86_64) live medium (Using NBD).
+Boot the Aaru's Arch Linux (x86_64) live medium (Using NBD).
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (x86_64) (NBD)
@@ -13,7 +13,7 @@ SYSAPPEND 3
 
 LABEL arch64_nfs
 TEXT HELP
-Boot the DiscImageChef's Arch Linux (x86_64) live medium (Using NFS).
+Boot the Aaru's Arch Linux (x86_64) live medium (Using NFS).
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (x86_64) (NFS)
@@ -24,7 +24,7 @@ SYSAPPEND 3
 
 LABEL arch64_http
 TEXT HELP
-Boot the DiscImageChef's Arch Linux (x86_64) live medium (Using HTTP).
+Boot the Aaru's Arch Linux (x86_64) live medium (Using HTTP).
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (x86_64) (HTTP)
diff --git a/archaaru-x86_64/syslinux/archiso_sys.cfg b/archaaru-x86_64/syslinux/archiso_sys.cfg
index 508c967..7dab972 100644
--- a/archaaru-x86_64/syslinux/archiso_sys.cfg
+++ b/archaaru-x86_64/syslinux/archiso_sys.cfg
@@ -2,7 +2,7 @@ INCLUDE boot/syslinux/archiso_head.cfg
 
 LABEL arch64
 TEXT HELP
-Boot the DiscImageChef's Arch Linux (x86_64) live medium.
+Boot the Aaru's Arch Linux (x86_64) live medium.
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (x86_64)
diff --git a/buildall.sh b/buildall.sh
index f1fa4f0..c34ffc5 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 cd archdic-x86
-./build.sh -v -N dicarch -L DIC_`date +%Y%m` -P "Natalia Portillo <claunia@claunia.com>" -A "DiscImageChef Rescue CD"
+./build.sh -v -N dicarch -L DIC_`date +%Y%m` -P "Natalia Portillo <claunia@claunia.com>" -A "Aaru Rescue CD"
 cd ../archdic-x86_64
-./build.sh -v -N dicarch -L DIC_`date +%Y%m` -P "Natalia Portillo <claunia@claunia.com>" -A "DiscImageChef Rescue CD"
+./build.sh -v -N dicarch -L DIC_`date +%Y%m` -P "Natalia Portillo <claunia@claunia.com>" -A "Aaru Rescue CD"
 cd ..