diff --git a/Dockerfile b/Dockerfile
index b26b897..f61b1f8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
 FROM ghcr.io/wiiu-env/devkitppc:20241128
 
 COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20250105-94ce09a /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:0.8.2-dev-20250125-f8faa9f /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libwupsbackend:20240425 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libnotifications:20240426 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20250104-0663ede /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libbuttoncombo:20250125-cb22627 /artifacts $DEVKITPRO
 
 WORKDIR project
diff --git a/source/plugin/ButtonComboManager.cpp b/source/plugin/ButtonComboManager.cpp
index 7385b7c..eb02483 100644
--- a/source/plugin/ButtonComboManager.cpp
+++ b/source/plugin/ButtonComboManager.cpp
@@ -245,30 +245,30 @@ namespace {
     ButtonComboModule_ComboType convertType(const WUPSButtonCombo_ComboType other) {
         switch (other) {
             case WUPS_BUTTON_COMBO_COMBO_TYPE_INVALID:
-                return BUTTON_COMBO_MODULE_TYPE_INVALID;
+                return BUTTON_COMBO_MODULE_COMBO_TYPE_INVALID;
             case WUPS_BUTTON_COMBO_COMBO_TYPE_HOLD:
-                return BUTTON_COMBO_MODULE_TYPE_HOLD;
+                return BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD;
             case WUPS_BUTTON_COMBO_COMBO_TYPE_PRESS_DOWN:
-                return BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN;
+                return BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN;
             case WUPS_BUTTON_COMBO_COMBO_TYPE_HOLD_OBSERVER:
-                return BUTTON_COMBO_MODULE_TYPE_HOLD_OBSERVER;
+                return BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD_OBSERVER;
             case WUPS_BUTTON_COMBO_COMBO_TYPE_PRESS_DOWN_OBSERVER:
-                return BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN_OBSERVER;
+                return BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN_OBSERVER;
         }
-        return BUTTON_COMBO_MODULE_TYPE_INVALID;
+        return BUTTON_COMBO_MODULE_COMBO_TYPE_INVALID;
     }
 
     WUPSButtonCombo_ComboType convertType(const ButtonComboModule_ComboType other) {
         switch (other) {
-            case BUTTON_COMBO_MODULE_TYPE_INVALID:
+            case BUTTON_COMBO_MODULE_COMBO_TYPE_INVALID:
                 return WUPS_BUTTON_COMBO_COMBO_TYPE_INVALID;
-            case BUTTON_COMBO_MODULE_TYPE_HOLD:
+            case BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD:
                 return WUPS_BUTTON_COMBO_COMBO_TYPE_HOLD;
-            case BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN:
+            case BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN:
                 return WUPS_BUTTON_COMBO_COMBO_TYPE_PRESS_DOWN;
-            case BUTTON_COMBO_MODULE_TYPE_HOLD_OBSERVER:
+            case BUTTON_COMBO_MODULE_COMBO_TYPE_HOLD_OBSERVER:
                 return WUPS_BUTTON_COMBO_COMBO_TYPE_HOLD_OBSERVER;
-            case BUTTON_COMBO_MODULE_TYPE_PRESS_DOWN_OBSERVER:
+            case BUTTON_COMBO_MODULE_COMBO_TYPE_PRESS_DOWN_OBSERVER:
                 return WUPS_BUTTON_COMBO_COMBO_TYPE_PRESS_DOWN_OBSERVER;
         }
         return WUPS_BUTTON_COMBO_COMBO_TYPE_INVALID;