diff --git a/src/drivers.h b/src/drivers.h
index 8df33c1..5cdf309 100644
--- a/src/drivers.h
+++ b/src/drivers.h
@@ -74,7 +74,7 @@ typedef void (*ReadingsUpdateFunc) (SensorDevice *sensor_device,
 
 
 typedef struct {
-	const char             *name;
+	const char             *driver_name;
 	DriverType              type;
 
 	gboolean       (*discover)    (GUdevDevice        *device);
diff --git a/src/drv-fake-compass.c b/src/drv-fake-compass.c
index 6c8cc36..2e02766 100644
--- a/src/drv-fake-compass.c
+++ b/src/drv-fake-compass.c
@@ -108,7 +108,7 @@ fake_compass_close (SensorDevice *sensor_device)
 }
 
 SensorDriver fake_compass = {
-	.name = "Fake compass",
+	.driver_name = "Fake compass",
 	.type = DRIVER_TYPE_COMPASS,
 
 	.discover = fake_compass_discover,
diff --git a/src/drv-fake-light.c b/src/drv-fake-light.c
index df6a459..0e22b29 100644
--- a/src/drv-fake-light.c
+++ b/src/drv-fake-light.c
@@ -108,7 +108,7 @@ fake_light_close (SensorDevice *sensor_device)
 }
 
 SensorDriver fake_light = {
-	.name = "Fake light",
+	.driver_name = "Fake light",
 	.type = DRIVER_TYPE_LIGHT,
 
 	.discover = fake_light_discover,
diff --git a/src/drv-hwmon-light.c b/src/drv-hwmon-light.c
index 26fde11..6778ee5 100644
--- a/src/drv-hwmon-light.c
+++ b/src/drv-hwmon-light.c
@@ -106,7 +106,7 @@ hwmon_light_close (SensorDevice *sensor_device)
 }
 
 SensorDriver hwmon_light = {
-	.name = "Platform HWMon Light",
+	.driver_name = "Platform HWMon Light",
 	.type = DRIVER_TYPE_LIGHT,
 
 	.discover = hwmon_light_discover,
diff --git a/src/drv-iio-buffer-accel.c b/src/drv-iio-buffer-accel.c
index fbb8fb2..84f6148 100644
--- a/src/drv-iio-buffer-accel.c
+++ b/src/drv-iio-buffer-accel.c
@@ -244,7 +244,7 @@ iio_buffer_accel_close (SensorDevice *sensor_device)
 }
 
 SensorDriver iio_buffer_accel = {
-	.name = "IIO Buffer accelerometer",
+	.driver_name = "IIO Buffer accelerometer",
 	.type = DRIVER_TYPE_ACCEL,
 
 	.discover = iio_buffer_accel_discover,
diff --git a/src/drv-iio-buffer-compass.c b/src/drv-iio-buffer-compass.c
index 1660203..7f824ff 100644
--- a/src/drv-iio-buffer-compass.c
+++ b/src/drv-iio-buffer-compass.c
@@ -212,7 +212,7 @@ iio_buffer_compass_close (SensorDevice *sensor_device)
 }
 
 SensorDriver iio_buffer_compass = {
-	.name = "IIO Buffer Compass",
+	.driver_name = "IIO Buffer Compass",
 	.type = DRIVER_TYPE_COMPASS,
 
 	.discover = iio_buffer_compass_discover,
diff --git a/src/drv-iio-buffer-light.c b/src/drv-iio-buffer-light.c
index bac2615..40a1a10 100644
--- a/src/drv-iio-buffer-light.c
+++ b/src/drv-iio-buffer-light.c
@@ -216,7 +216,7 @@ iio_buffer_light_close (SensorDevice *sensor_device)
 }
 
 SensorDriver iio_buffer_light = {
-	.name = "IIO Buffer Light sensor",
+	.driver_name = "IIO Buffer Light sensor",
 	.type = DRIVER_TYPE_LIGHT,
 
 	.discover = iio_buffer_light_discover,
diff --git a/src/drv-iio-poll-accel.c b/src/drv-iio-poll-accel.c
index 0b03d30..e3e515f 100644
--- a/src/drv-iio-poll-accel.c
+++ b/src/drv-iio-poll-accel.c
@@ -129,7 +129,7 @@ iio_poll_accel_close (SensorDevice *sensor_device)
 }
 
 SensorDriver iio_poll_accel = {
-	.name = "IIO Poll accelerometer",
+	.driver_name = "IIO Poll accelerometer",
 	.type = DRIVER_TYPE_ACCEL,
 
 	.discover = iio_poll_accel_discover,
diff --git a/src/drv-iio-poll-light.c b/src/drv-iio-poll-light.c
index 4b3afe0..ab1676f 100644
--- a/src/drv-iio-poll-light.c
+++ b/src/drv-iio-poll-light.c
@@ -177,7 +177,7 @@ iio_poll_light_close (SensorDevice *sensor_device)
 }
 
 SensorDriver iio_poll_light = {
-	.name = "IIO Polling Light sensor",
+	.driver_name = "IIO Polling Light sensor",
 	.type = DRIVER_TYPE_LIGHT,
 
 	.discover = iio_poll_light_discover,
diff --git a/src/drv-iio-poll-proximity.c b/src/drv-iio-poll-proximity.c
index 4c642f1..dc7a6ba 100644
--- a/src/drv-iio-poll-proximity.c
+++ b/src/drv-iio-poll-proximity.c
@@ -128,7 +128,7 @@ iio_poll_proximity_close (SensorDevice *sensor_device)
 }
 
 SensorDriver iio_poll_proximity = {
-	.name = "IIO Poll proximity sensor",
+	.driver_name = "IIO Poll proximity sensor",
 	.type = DRIVER_TYPE_PROXIMITY,
 
 	.discover = iio_poll_proximity_discover,
diff --git a/src/drv-input-accel.c b/src/drv-input-accel.c
index 1bb6ea8..e04883f 100644
--- a/src/drv-input-accel.c
+++ b/src/drv-input-accel.c
@@ -268,7 +268,7 @@ input_accel_close (SensorDevice *sensor_device)
 }
 
 SensorDriver input_accel = {
-	.name = "Input accelerometer",
+	.driver_name = "Input accelerometer",
 	.type = DRIVER_TYPE_ACCEL,
 
 	.discover = input_accel_discover,
diff --git a/src/iio-sensor-proxy.c b/src/iio-sensor-proxy.c
index 5791454..9baae4c 100644
--- a/src/iio-sensor-proxy.c
+++ b/src/iio-sensor-proxy.c
@@ -130,7 +130,7 @@ find_sensors (GUdevClient *client,
 				g_debug ("Found device %s of type %s at %s",
 					 g_udev_device_get_sysfs_path (dev),
 					 driver_type_to_str (driver->type),
-					 driver->name);
+					 driver->driver_name);
 				UDEV_DEVICE_FOR_TYPE(driver->type) = g_object_ref (dev);
 				DRIVER_FOR_TYPE(driver->type) = (SensorDriver *) driver;
 
@@ -856,7 +856,7 @@ sensor_changes (GUdevClient *client,
 				g_debug ("Found hotplugged device %s of type %s at %s",
 					 g_udev_device_get_sysfs_path (device),
 					 driver_type_to_str (driver->type),
-					 driver->name);
+					 driver->driver_name);
 
 				if (driver_open (driver, device,
 						 driver_type_to_callback_func (driver->type), data)) {