diff --git a/src/driver-test.c b/src/driver-test.c
index 5a42932e..91a30e47 100644
--- a/src/driver-test.c
+++ b/src/driver-test.c
@@ -116,7 +116,7 @@ struct ratbag_driver test_driver = {
 	.name = "Test driver",
 	.id = "test_driver",
 	.probe = test_fake_probe,
-	.__test_probe = test_probe,
+	.test_probe = test_probe,
 	.remove = test_remove,
 	.read_profile = test_read_profile,
 	.write_profile = test_write_profile,
diff --git a/src/libratbag-hidraw.c b/src/libratbag-hidraw.c
index d889a496..465f872e 100644
--- a/src/libratbag-hidraw.c
+++ b/src/libratbag-hidraw.c
@@ -196,9 +196,9 @@ err:
 }
 
 static int
-__ratbag_find_hidraw(struct ratbag_device *device,
-		     int (*match)(struct ratbag_device *device),
-		     int use_usb_parent)
+ratbag_find_hidraw_node(struct ratbag_device *device,
+			int (*match)(struct ratbag_device *device),
+			int use_usb_parent)
 {
 	struct ratbag *ratbag = device->ratbag;
 	struct udev_enumerate *e;
@@ -264,7 +264,7 @@ out:
 int
 ratbag_find_hidraw(struct ratbag_device *device, int (*match)(struct ratbag_device *device))
 {
-	return __ratbag_find_hidraw(device, match, true);
+	return ratbag_find_hidraw_node(device, match, true);
 }
 
 static int
@@ -276,7 +276,7 @@ hidraw_match_all(struct ratbag_device *device)
 int
 ratbag_open_hidraw(struct ratbag_device *device)
 {
-	return __ratbag_find_hidraw(device, hidraw_match_all, false);
+	return ratbag_find_hidraw_node(device, hidraw_match_all, false);
 }
 
 static struct ratbag_hid_report *
diff --git a/src/libratbag-private.h b/src/libratbag-private.h
index 518e87d6..ed1a0aec 100644
--- a/src/libratbag-private.h
+++ b/src/libratbag-private.h
@@ -203,7 +203,7 @@ struct ratbag_driver {
 				    int dpi_x, int dpi_y);
 
 	/* private */
-	int (*__test_probe)(struct ratbag_device *device, void *data);
+	int (*test_probe)(struct ratbag_device *device, void *data);
 
 	struct list link;
 };
diff --git a/src/libratbag.c b/src/libratbag.c
index bb29dc77..db919631 100644
--- a/src/libratbag.c
+++ b/src/libratbag.c
@@ -311,7 +311,7 @@ ratbag_find_driver(struct ratbag_device *device,
 	}
 
 	if (test_device)
-		rc = device->driver->__test_probe(device, test_device);
+		rc = device->driver->test_probe(device, test_device);
 	else
 		rc = device->driver->probe(device);
 	if (rc == 0) {