diff --git a/cores/libretro-net-retropad/net_retropad_core.c b/cores/libretro-net-retropad/net_retropad_core.c
index c0f7916b7472..6cc0817420e8 100644
--- a/cores/libretro-net-retropad/net_retropad_core.c
+++ b/cores/libretro-net-retropad/net_retropad_core.c
@@ -640,6 +640,7 @@ void NETRETROPAD_CORE_PREFIX(retro_set_environment)(retro_environment_t cb)
    };
    enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
    struct retro_keyboard_callback kcb = { NETRETROPAD_CORE_PREFIX(update_keyboard_cb) };
+   struct retro_sensor_interface sensor_interface = {0};
 
    cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
 
@@ -654,12 +655,12 @@ void NETRETROPAD_CORE_PREFIX(retro_set_environment)(retro_environment_t cb)
 
    NETRETROPAD_CORE_PREFIX(environ_cb)(RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK, &kcb);
 
-	if (cb(RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE, &sensorInterface)) {
+	if (cb(RETRO_ENVIRONMENT_GET_SENSOR_INTERFACE, &sensor_interface)) {
 
       NETRETROPAD_CORE_PREFIX(log_cb)(RETRO_LOG_DEBUG,"[Remote RetroPad]: Sensor interface supported, enabling.\n");
 
-		NETRETROPAD_CORE_PREFIX(sensor_get_input_cb) = sensorInterface.get_sensor_input;
-		NETRETROPAD_CORE_PREFIX(sensor_set_state_cb) = sensorInterface.set_sensor_state;
+		NETRETROPAD_CORE_PREFIX(sensor_get_input_cb) = sensor_interface.get_sensor_input;
+		NETRETROPAD_CORE_PREFIX(sensor_set_state_cb) = sensor_interface.set_sensor_state;
 
 
 		if (NETRETROPAD_CORE_PREFIX(sensor_set_state_cb) && NETRETROPAD_CORE_PREFIX(sensor_get_input_cb)) {
diff --git a/tests-other/testinput.cfg b/tests-other/testinput.cfg
index 494b04e197bc..6bb7d2e0028f 100644
--- a/tests-other/testinput.cfg
+++ b/tests-other/testinput.cfg
@@ -2,7 +2,7 @@
 # Sets up joypad driver, test input file for the joypad driver,
 # logging and autoconfig dir, and prevents saving.
 # Usage: retroarch --appendconfig tests-other/testinput.cfg\|tests_other/all_binds_empty.cfg
-# Usage with retropad test counterpart: retroarch --appendconfig tests_other/testinput.cfg\|tests_other/all_binds_empty.cfg -L netretropad tests_other/netretropad_all_inputs.ratst
+# Usage with retropad test counterpart: retroarch --appendconfig tests-other/testinput.cfg\|tests-other/all_binds_empty.cfg -L netretropad tests-other/netretropad_all_inputs.ratst
 
 input_joypad_driver = "test"
 test_input_file_joypad = "tests-other/test_input_joypad.ratst"
diff --git a/tests-other/testinput_device_reservation_test.cfg b/tests-other/testinput_device_reservation_test.cfg
index 4529555dcb63..f05e8488f0f2 100644
--- a/tests-other/testinput_device_reservation_test.cfg
+++ b/tests-other/testinput_device_reservation_test.cfg
@@ -2,7 +2,7 @@
 # Sets up joypad driver, test input file for the joypad driver,
 # logging and autoconfig dir, and prevents saving.
 # Usage:
-#   retroarch --appendconfig tests_other/testinput_device_reservation_test.cfg\|tests_other/all_binds_empty.cfg
+#   retroarch --appendconfig tests-other/testinput_device_reservation_test.cfg\|tests-other/all_binds_empty.cfg
 
 # Test scenario:
 # - Player 1 has preferred device C, Player 4 has reserved device B
diff --git a/tests-other/testinput_device_reservation_test2.cfg b/tests-other/testinput_device_reservation_test2.cfg
index 7be535a878ba..33a37941c1ec 100644
--- a/tests-other/testinput_device_reservation_test2.cfg
+++ b/tests-other/testinput_device_reservation_test2.cfg
@@ -2,7 +2,7 @@
 # Sets up joypad driver, test input file for the joypad driver,
 # logging and autoconfig dir, and prevents saving.
 # Usage:
-#   retroarch --appendconfig tests_other/testinput_device_reservation_test.cfg\|tests_other/all_binds_empty.cfg
+#   retroarch --appendconfig tests-other/testinput_device_reservation_test.cfg\|tests-other/all_binds_empty.cfg
 
 # Test scenario:
 # - Player 1 through 4 has preferred device C
@@ -26,4 +26,4 @@ input_player3_reserved_device = "0005:0006 Test joypad device C"
 input_player3_device_reservation_type = "2"
 input_player4_reserved_device = "0005:0006 "
 input_player4_device_reservation_type = "2"
-# input_max_users = "3"
\ No newline at end of file
+# input_max_users = "3"