diff --git a/AUTHORS b/AUTHORS
index 76833cba6b..d246b1733b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,6 @@
 Hans-Kristian Arntzen - <maister@archlinux.us>
    - Main code, maintainer
+   - Gamecube/Wii libogc port
 
 Devin J. Pohly - <djpohly@djpohly.com>
    - Joypad axis support
@@ -10,7 +11,9 @@ Chris Moeller - <kode54@gmail.com>
 Daniel De Matteis - <autechre1024@hotmail.com>
    - PlayStation 3 port
    - XBox 360 XDK port
+   - Libxenon port
    - XBox 1 port
+   - Gamecube/Wii libogc port
 
 David Reichelt - <freakdave@hotmail.com>
    - XBox 1 port
@@ -19,6 +22,7 @@ tukuyomi - <tukuyomi@free.fr>
    - Cleanups in quickbuild
 
 Michael Lelli - <toadking@toadking.com>
+   - Gamecube/Wii libogc port
    - Raspberry Pi video driver
    - Linux Raw keyboard input driver
 
diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 90ddaab09c..589edfa1fa 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -105,7 +105,7 @@ VIDEO DRIVER
 #elif defined(HAVE_OPENGLES20)
 #include "../../gfx/gles.c"
 #elif defined(GEKKO)
-#include "../../wii/video.c"
+#include "../../wii/gx_video.c"
 #endif
 
 #include "../../gfx/gfx_common.c"
@@ -137,7 +137,7 @@ INPUT
 #if defined(__CELLOS_LV2__)
 #include "../../ps3/ps3_input.c"
 #elif defined(GEKKO)
-#include "../../wii/input.c"
+#include "../../wii/gx_input.c"
 #endif
 
 #ifdef _XBOX
@@ -195,7 +195,7 @@ AUDIO
 #elif defined(_XBOX360)
 #include "../../360/xdk360_audio.cpp"
 #elif defined(GEKKO)
-#include "../../wii/audio.c"
+#include "../../wii/gx_audio.c"
 #endif
 
 #ifdef HAVE_DSOUND
diff --git a/wii/audio.c b/wii/gx_audio.c
similarity index 100%
rename from wii/audio.c
rename to wii/gx_audio.c
diff --git a/wii/input.c b/wii/gx_input.c
similarity index 99%
rename from wii/input.c
rename to wii/gx_input.c
index 339f8dde19..cbcc279009 100644
--- a/wii/input.c
+++ b/wii/gx_input.c
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2012 - Hans-Kristian Arntzen
+ *  Copyright (C) 2010-2012 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2012 - Daniel De Matteis
  *  Copyright (C) 2012 - Michael Lelli
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -27,7 +28,7 @@
 #define M_PI 3.14159265358979323846264338327
 #endif
 
-#include "wii_input.h"
+#include "gx_input.h"
 #include "../driver.h"
 #include "../libretro.h"
 #include <stdlib.h>
diff --git a/wii/wii_input.h b/wii/gx_input.h
similarity index 99%
rename from wii/wii_input.h
rename to wii/gx_input.h
index 0185e0316c..6b15953db2 100644
--- a/wii/wii_input.h
+++ b/wii/gx_input.h
@@ -1,5 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2010-2012 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2012 - Daniel De Matteis
  *  Copyright (C) 2012 - Michael Lelli
  * 
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
diff --git a/wii/video.c b/wii/gx_video.c
similarity index 100%
rename from wii/video.c
rename to wii/gx_video.c