diff --git a/Makefile.ps2 b/Makefile.ps2
index 73bfeb9b6c..e9f22d2726 100644
--- a/Makefile.ps2
+++ b/Makefile.ps2
@@ -54,10 +54,10 @@ endif
 CFLAGS += $(RARCH_DEFINES)
 
 # All the IRX objects
-EE_OBJS += $(IRX_DIR)/freemtap_irx.o $(IRX_DIR)/freepad_irx.o $(IRX_DIR)/freesio2_irx.o $(IRX_DIR)/iomanX_irx.o
-EE_OBJS += $(IRX_DIR)/fileXio_irx.o $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o
-EE_OBJS += $(IRX_DIR)/usbhdfsd_irx.o $(IRX_DIR)/freesd_irx.o $(IRX_DIR)/audsrv_irx.o $(IRX_DIR)/poweroff_irx.o
-EE_OBJS += $(IRX_DIR)/cdfs_irx.o
+EE_OBJS += $(IRX_DIR)/sio2man_irx.o $ $(IRX_DIR)/iomanX_irx.o $(IRX_DIR)/fileXio_irx.o 
+EE_OBJS += $(IRX_DIR)/mcman_irx.o $(IRX_DIR)/mcserv_irx.o $(IRX_DIR)/usbd_irx.o $(IRX_DIR)/usbhdfsd_irx.o
+EE_OBJS += $(IRX_DIR)/libsd_irx.o $(IRX_DIR)/audsrv_irx.o $(IRX_DIR)/poweroff_irx.o
+EE_OBJS += $(IRX_DIR)/cdfs_irx.o $(IRX_DIR)/padman_irx.o
 
 # Missing objecst on the PS2SDK
 EE_OBJS += ps2/compat_files/ps2_devices.o 
diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c
index 4241d1d554..dcae69c62c 100644
--- a/frontend/drivers/platform_ps2.c
+++ b/frontend/drivers/platform_ps2.c
@@ -154,7 +154,7 @@ static void frontend_ps2_init(void *data)
    /* I/O Files */
    SifExecModuleBuffer(&iomanX_irx, size_iomanX_irx, 0, NULL, NULL);
    SifExecModuleBuffer(&fileXio_irx, size_fileXio_irx, 0, NULL, NULL);
-   SifExecModuleBuffer(&freesio2_irx, size_freesio2_irx, 0, NULL, NULL);
+   SifExecModuleBuffer(&sio2man_irx, size_sio2man_irx, 0, NULL, NULL);
 
    /* Memory Card */
    SifExecModuleBuffer(&mcman_irx, size_mcman_irx, 0, NULL, NULL);
@@ -164,16 +164,17 @@ static void frontend_ps2_init(void *data)
    SifExecModuleBuffer(&usbd_irx, size_usbd_irx, 0, NULL, NULL);
    SifExecModuleBuffer(&usbhdfsd_irx, size_usbhdfsd_irx, 0, NULL, NULL);
 
+#if !defined(DEBUG)
    /* CDFS */
    SifExecModuleBuffer(&cdfs_irx, size_cdfs_irx, 0, NULL, NULL);
+#endif
 
 #ifndef IS_SALAMANDER
    /* Controllers */
-   SifExecModuleBuffer(&freemtap_irx, size_freemtap_irx, 0, NULL, NULL);
-   SifExecModuleBuffer(&freepad_irx, size_freepad_irx, 0, NULL, NULL);
+   SifExecModuleBuffer(&padman_irx, size_padman_irx, 0, NULL, NULL);
 
    /* Audio */
-   SifExecModuleBuffer(&freesd_irx, size_freesd_irx, 0, NULL, NULL);
+   SifExecModuleBuffer(&libsd_irx, size_libsd_irx, 0, NULL, NULL);
    SifExecModuleBuffer(&audsrv_irx, size_audsrv_irx, 0, NULL, NULL);
 
    /* Initializes audsrv library */
@@ -182,20 +183,11 @@ static void frontend_ps2_init(void *data)
       RARCH_ERR("audsrv library not initalizated\n");
    }
 
-   /* Initializes pad libraries
-      Must be init with 0 as parameter*/
-   if (mtapInit() != 1)
-   {
-      RARCH_ERR("mtapInit library not initalizated\n");
-   }
+   /* Initializes pad library */
    if (padInit(0) != 1)
    {
       RARCH_ERR("padInit library not initalizated\n");
    }
-   if (mtapPortOpen(0) != 1)
-   {
-      RARCH_ERR("mtapPortOpen library not initalizated\n");
-   }
 #endif
 
 #if defined(BUILD_FOR_PCSX2)
@@ -218,7 +210,9 @@ static void frontend_ps2_init(void *data)
    verbosity_enable();
 #endif
 
+#if !defined(DEBUG)
    waitUntilDeviceIsReady(bootDeviceID);
+#endif
 }
 
 static void frontend_ps2_deinit(void *data)
diff --git a/ps2/compat_files/ps2_devices.c b/ps2/compat_files/ps2_devices.c
index bd020d7b50..d996f75348 100644
--- a/ps2/compat_files/ps2_devices.c
+++ b/ps2/compat_files/ps2_devices.c
@@ -172,13 +172,6 @@ bool waitUntilDeviceIsReady(enum BootDeviceIDs device_id)
       ret = stat(rootDevice, &buffer);
       /* Wait untill the device is ready */
       nopdelay();
-      nopdelay();
-      nopdelay();
-      nopdelay();
-      nopdelay();
-      nopdelay();
-      nopdelay();
-      nopdelay();
 
       retries--;
    }
diff --git a/ps2/include/ps2_irx_variables.h b/ps2/include/ps2_irx_variables.h
index 08de739166..16dfa66779 100644
--- a/ps2/include/ps2_irx_variables.h
+++ b/ps2/include/ps2_irx_variables.h
@@ -15,8 +15,8 @@
 #ifndef PS2_IRX_VARIABLES_H
 #define PS2_IRX_VARIABLES_H
 
-extern unsigned char freesio2_irx;
-extern unsigned int size_freesio2_irx;
+extern unsigned char sio2man_irx;
+extern unsigned int size_sio2man_irx;
 
 extern unsigned char mcman_irx;
 extern unsigned int size_mcman_irx;
@@ -27,8 +27,8 @@ extern unsigned int size_mcserv_irx;
 extern unsigned char freemtap_irx;
 extern unsigned int size_freemtap_irx;
 
-extern unsigned char freepad_irx;
-extern unsigned int size_freepad_irx;
+extern unsigned char padman_irx;
+extern unsigned int size_padman_irx;
 
 extern unsigned char poweroff_irx;
 extern unsigned int size_poweroff_irx;
@@ -60,10 +60,10 @@ extern unsigned int size_usbhdfsd_irx;
 extern unsigned char cdfs_irx;
 extern unsigned int size_cdfs_irx;
 
+extern unsigned char libsd_irx;
+extern unsigned int size_libsd_irx;
+
 extern unsigned char audsrv_irx;
 extern unsigned int size_audsrv_irx;
 
-extern unsigned char freesd_irx;
-extern unsigned int size_freesd_irx;
-
 #endif /* PS2_IRX_VARIABLES_H */
diff --git a/ps2/irx/Makefile b/ps2/irx/Makefile
index 1a957bf553..cadb2ce4cf 100644
--- a/ps2/irx/Makefile
+++ b/ps2/irx/Makefile
@@ -4,8 +4,8 @@ IRX_DIR = $(PS2SDK)/iop/irx
 
 #IRX modules
 # IRX modules - modules have to be in IRX_DIR
-IRX_FILES += freemtap.irx freepad.irx freesio2.irx iomanX.irx fileXio.irx mcman.irx mcserv.irx usbd.irx usbhdfsd.irx 
-IRX_FILES += freesd.irx audsrv.irx poweroff.irx cdfs.irx
+IRX_FILES += iomanX.irx fileXio.irx sio2man.irx padman.irx mcman.irx mcserv.irx usbd.irx usbhdfsd.irx
+IRX_FILES += libsd.irx audsrv.irx poweroff.irx cdfs.irx
 IRX_C_FILES = $(IRX_FILES:.irx=_irx.c) 
 
 all: irxs