diff --git a/src/libei-device.c b/src/libei-device.c
index 91caebe..521c294 100644
--- a/src/libei-device.c
+++ b/src/libei-device.c
@@ -1104,12 +1104,12 @@ static inline void
 ei_device_resume_scrolling(struct ei_device *device, double x, double y)
 {
 	if (x) {
-		device->scroll.x_is_stopped = false;
-		device->scroll.x_is_cancelled = false;
+		device->scroll_state.x_is_stopped = false;
+		device->scroll_state.x_is_cancelled = false;
 	}
 	if (y) {
-		device->scroll.y_is_stopped = false;
-		device->scroll.y_is_cancelled = false;
+		device->scroll_state.y_is_stopped = false;
+		device->scroll_state.y_is_cancelled = false;
 	}
 }
 
@@ -1331,13 +1331,13 @@ ei_device_pointer_scroll_stop(struct ei_device *device, bool x, bool y)
 	}
 
 	/* Filter out duplicate scroll stop requests */
-	if (x && !device->scroll.x_is_stopped)
-		device->scroll.x_is_stopped = true;
+	if (x && !device->scroll_state.x_is_stopped)
+		device->scroll_state.x_is_stopped = true;
 	else
 		x = false;
 
-	if (y && !device->scroll.y_is_stopped)
-		device->scroll.y_is_stopped = true;
+	if (y && !device->scroll_state.y_is_stopped)
+		device->scroll_state.y_is_stopped = true;
 	else
 		y = false;
 
@@ -1361,16 +1361,16 @@ ei_device_pointer_scroll_cancel(struct ei_device *device, bool x, bool y)
 	}
 
 	/* Filter out duplicate scroll cancelled requests */
-	if (x && !device->scroll.x_is_cancelled) {
-		device->scroll.x_is_stopped = true;
-		device->scroll.x_is_cancelled = true;
+	if (x && !device->scroll_state.x_is_cancelled) {
+		device->scroll_state.x_is_stopped = true;
+		device->scroll_state.x_is_cancelled = true;
 	} else {
 		x = false;
 	}
 
-	if (y && !device->scroll.y_is_cancelled) {
-		device->scroll.y_is_stopped = true;
-		device->scroll.y_is_cancelled = true;
+	if (y && !device->scroll_state.y_is_cancelled) {
+		device->scroll_state.y_is_stopped = true;
+		device->scroll_state.y_is_cancelled = true;
 	} else {
 		y = false;
 	}
diff --git a/src/libei-device.h b/src/libei-device.h
index 86dfd58..560c5a0 100644
--- a/src/libei-device.h
+++ b/src/libei-device.h
@@ -80,7 +80,7 @@ struct ei_device {
 	struct {
 		bool x_is_stopped, y_is_stopped;
 		bool x_is_cancelled, y_is_cancelled;
-	} scroll;
+	} scroll_state;
 
 	struct ei_keymap *keymap;
 };
diff --git a/src/libeis-device.c b/src/libeis-device.c
index 7080e6f..37c8a49 100644
--- a/src/libeis-device.c
+++ b/src/libeis-device.c
@@ -973,12 +973,12 @@ static inline void
 eis_device_resume_scrolling(struct eis_device *device, double x, double y)
 {
 	if (x) {
-		device->scroll.x_is_stopped = false;
-		device->scroll.x_is_cancelled = false;
+		device->scroll_state.x_is_stopped = false;
+		device->scroll_state.x_is_cancelled = false;
 	}
 	if (y) {
-		device->scroll.y_is_stopped = false;
-		device->scroll.y_is_cancelled = false;
+		device->scroll_state.y_is_stopped = false;
+		device->scroll_state.y_is_cancelled = false;
 	}
 }
 
@@ -1014,13 +1014,13 @@ eis_device_pointer_scroll_stop(struct eis_device *device, bool x, bool y)
 		return;
 
 	/* Filter out duplicate scroll stop requests */
-	if (x && !device->scroll.x_is_stopped)
-		device->scroll.x_is_stopped = true;
+	if (x && !device->scroll_state.x_is_stopped)
+		device->scroll_state.x_is_stopped = true;
 	else
 		x = false;
 
-	if (y && !device->scroll.y_is_stopped)
-		device->scroll.y_is_stopped = true;
+	if (y && !device->scroll_state.y_is_stopped)
+		device->scroll_state.y_is_stopped = true;
 	else
 		y = false;
 
@@ -1042,16 +1042,16 @@ eis_device_pointer_scroll_cancel(struct eis_device *device, bool x, bool y)
 		return;
 
 	/* Filter out duplicate scroll cancelled requests */
-	if (x && !device->scroll.x_is_cancelled) {
-		device->scroll.x_is_stopped = true;
-		device->scroll.x_is_cancelled = true;
+	if (x && !device->scroll_state.x_is_cancelled) {
+		device->scroll_state.x_is_stopped = true;
+		device->scroll_state.x_is_cancelled = true;
 	} else {
 		x = false;
 	}
 
-	if (y && !device->scroll.y_is_cancelled) {
-		device->scroll.y_is_stopped = true;
-		device->scroll.y_is_cancelled = true;
+	if (y && !device->scroll_state.y_is_cancelled) {
+		device->scroll_state.y_is_stopped = true;
+		device->scroll_state.y_is_cancelled = true;
 	} else {
 		y = false;
 	}
diff --git a/src/libeis-device.h b/src/libeis-device.h
index 0f23f83..c248077 100644
--- a/src/libeis-device.h
+++ b/src/libeis-device.h
@@ -69,7 +69,7 @@ struct eis_device {
 	struct {
 		bool x_is_stopped, y_is_stopped;
 		bool x_is_cancelled, y_is_cancelled;
-	} scroll;
+	} scroll_state;
 
 };