diff --git a/out/bins/ext_booter.bin b/out/bins/ext_booter.bin
index f8fa9d63..18c73524 100644
Binary files a/out/bins/ext_booter.bin and b/out/bins/ext_booter.bin differ
diff --git a/out/boot.dol b/out/boot.dol
index 44daf26d..1b8fd44c 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/hw/aes.c b/source/hw/aes.c
index 8d8f136a..bba654f6 100644
--- a/source/hw/aes.c
+++ b/source/hw/aes.c
@@ -53,7 +53,7 @@ void AES_EnableDecrypt(const u8 *key, const u8 *iv)
 
 #define AES_LIMIT 0x1000
 static u8 AES_BUF[AES_LIMIT*16] ATTRIBUTE_ALIGN(16); /* 64KB */
-void AES_Decrypt(u8 *inbuf, u8 *outbuf, u16 num_blocks)
+void AES_Decrypt_(u8 *inbuf, u8 *outbuf, u16 num_blocks)
 {
 	/* set mode back to 0 */
 	aes_mode = 0;
diff --git a/source/hw/aes.h b/source/hw/aes.h
index 9aca07d9..9b6cde54 100644
--- a/source/hw/aes.h
+++ b/source/hw/aes.h
@@ -19,6 +19,6 @@
 
 void AES_ResetEngine(void);
 void AES_EnableDecrypt(const u8 *key, const u8 *iv);
-void AES_Decrypt(u8 *inbuf, u8 *outbuf, u16 num_blocks);
+void AES_Decrypt_(u8 *inbuf, u8 *outbuf, u16 num_blocks);
 
 #endif
diff --git a/source/libwbfs/wiidisc.c b/source/libwbfs/wiidisc.c
index 37368192..3be42f55 100644
--- a/source/libwbfs/wiidisc.c
+++ b/source/libwbfs/wiidisc.c
@@ -42,7 +42,7 @@ void decrypt_title_key(u8 *tik, u8 *title_key)
 	{
 		AES_ResetEngine();
 		AES_EnableDecrypt((tik[0x01f1] == 1) ? korean_key : common_key, iv);
-		AES_Decrypt(tik + 0x01bf, title_key, 1);
+		AES_Decrypt_(tik + 0x01bf, title_key, 1);
 	}
 	else
 	{
@@ -106,7 +106,7 @@ static int partition_read_block(wiidisc_t *d, u32 blockno, u8 *block)
 	{
 		AES_ResetEngine();
 		AES_EnableDecrypt(d->disc_key, iv);
-		AES_Decrypt(raw + 0x400, block, 0x7c0);
+		AES_Decrypt_(raw + 0x400, block, 0x7c0);
 	}
 	else
 	{
diff --git a/source/menu/menu_wad.cpp b/source/menu/menu_wad.cpp
index 7bbcf42c..00ec67c1 100644
--- a/source/menu/menu_wad.cpp
+++ b/source/menu/menu_wad.cpp
@@ -208,7 +208,7 @@ int installWad(const char *path)
 			fread(AES_WAD_Buf, size_enc, 1, wad_file);
 			AES_EnableDecrypt(tik_key, aes_iv); //ISFS seems to reset it?
 			memcpy(aes_iv, AES_WAD_Buf+(size_enc-16), 16); //last block for cbc
-			AES_Decrypt(AES_WAD_Buf, AES_WAD_Buf, num_blocks);
+			AES_Decrypt_(AES_WAD_Buf, AES_WAD_Buf, num_blocks);
 
 			u64 size_dec = (content->size - read);
 			if(size_dec > WAD_BUF)