diff --git a/lib/inputdev/DualshockPad.cpp b/lib/inputdev/DualshockPad.cpp
index 747fcf7..6dd6f14 100644
--- a/lib/inputdev/DualshockPad.cpp
+++ b/lib/inputdev/DualshockPad.cpp
@@ -74,7 +74,7 @@ void DualshockPad::initialCycle()
 
 void DualshockPad::transferCycle()
 {
-    DualshockControllerState state;
+    DualshockPadState state;
     size_t recvSz = receiveUSBInterruptTransfer((uint8_t*)&state, 49);
     if (recvSz != 49)
         return;
diff --git a/test/main.cpp b/test/main.cpp
index 75724c6..a8a3d23 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -22,13 +22,13 @@ class DolphinSmashAdapterCallback : public IDolphinSmashAdapterCallback
     }
 };
 
-class DualshockPadCallback : public IDualshockControllerCallback
+class DualshockPadCallback : public IDualshockPadCallback
 {
     void controllerDisconnected()
     {
         printf("CONTROLLER DISCONNECTED\n");
     }
-    void controllerUpdate(const DualshockControllerState& state)
+    void controllerUpdate(const DualshockPadState& state)
     {
         static time_t timeTotal;
         static time_t lastTime = 0;