diff --git a/compat/getopt_rarch.h b/compat/getopt_rarch.h
index a3f2f7a551..989dec566a 100644
--- a/compat/getopt_rarch.h
+++ b/compat/getopt_rarch.h
@@ -27,8 +27,8 @@
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #else
-// Avoid possible naming collitions during link since we prefer to use the actual name.
-#define getopt_long(argc, argv, optstring, longopts, longindex) __getopt_long_ssnes(argc, argv, optstring, longopts, longindex)
+// Avoid possible naming collisions during link since we prefer to use the actual name.
+#define getopt_long(argc, argv, optstring, longopts, longindex) __getopt_long_rarch(argc, argv, optstring, longopts, longindex)
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/pandora/retroarch/retroarch.cfg b/pandora/retroarch/retroarch.cfg
index eb16eeaf35..83a2e4a4a6 100644
--- a/pandora/retroarch/retroarch.cfg
+++ b/pandora/retroarch/retroarch.cfg
@@ -239,7 +239,7 @@ input_player1_down = down
 # input_player8_joypad_index = 7
 
 # Joypad buttons.
-# Figure these out by using RetroArch-Phoenix or ssnes-joyconfig.
+# Figure these out by using RetroArch-Phoenix or retroarch-joyconfig.
 # You can use joypad hats with hnxx, where n is the hat, and xx is a string representing direction. 
 # E.g. "h0up"
 # input_player1_a_btn =