diff --git a/hid-newpidff.c b/hid-newpidff.c
index 1bbafcc..fde41a4 100644
--- a/hid-newpidff.c
+++ b/hid-newpidff.c
@@ -69,7 +69,7 @@ static int new_pidff_probe(struct hid_device *hdev,
 		goto err;
 	}
 
-	ret = hid_pidff_init(hdev, id);
+	ret = hid_new_pidff_init(hdev, id);
 	if (ret) {
 		hid_warn(hdev, "Force feedback not supported\n");
 		goto err;
diff --git a/hid-pidff.c b/hid-pidff.c
index c0493b6..9bb4f73 100644
--- a/hid-pidff.c
+++ b/hid-pidff.c
@@ -1250,7 +1250,7 @@ static int pidff_check_autocenter(struct pidff_device *pidff,
 /*
  * Check if the device is PID and initialize it
  */
-int hid_pidff_init(struct hid_device *hid, const struct hid_device_id *id)
+int hid_new_pidff_init(struct hid_device *hid, const struct hid_device_id *id)
 {
 	struct pidff_device *pidff;
 	struct hid_input *hidinput = list_entry(hid->inputs.next,
@@ -1272,7 +1272,7 @@ int hid_pidff_init(struct hid_device *hid, const struct hid_device_id *id)
 		return -ENOMEM;
 
 	pidff->hid = hid;
-	pidff->quirks |= id->device_data;
+	pidff->quirks |= id->driver_data;
 
 	hid_device_io_start(hid);
 
diff --git a/hid-pidff.h b/hid-pidff.h
index 1690f47..5c78e15 100644
--- a/hid-pidff.h
+++ b/hid-pidff.h
@@ -22,6 +22,6 @@
 #define PIDFF_QUIRK_NO_DELAY_EFFECT         BIT(2)
 
 
-int hid_pidff_init(struct hid_device *hid, const struct hid_device_id *id);
+int hid_new_pidff_init(struct hid_device *hid, const struct hid_device_id *id);
 
 #endif