diff --git a/include/overlay025/poketch_button.h b/include/overlay025/poketch_button.h
index f579a81993..a63f11cc6b 100644
--- a/include/overlay025/poketch_button.h
+++ b/include/overlay025/poketch_button.h
@@ -55,11 +55,11 @@ typedef struct PoketchButtonManager {
     PoketchButton * buttons;
 } PoketchButtonManager;
 
-PoketchButtonManager * PoketchButtonManager_Create(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID);
-void PoketchButtonManager_Destroy(PoketchButtonManager *buttonManager);
+PoketchButtonManager * PoketchButtonManager_New(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID);
+void PoketchButtonManager_Free(PoketchButtonManager *buttonManager);
 void PoketchButtonManager_Update(PoketchButtonManager *buttonManager);
-void PoketchButtonManager_ButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time);
-void PoketchButtonManager_RepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime);
+void PoketchButtonManager_SetButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time);
+void PoketchButtonManager_SetRepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime);
 void PoketchButtonManager_ResetButtonState(PoketchButtonManager *buttonManager, u32 index);
 
 #endif // POKEPLATINUM_POKETCH_BUTTON_H
diff --git a/include/struct_defs/union_02022594.h b/include/struct_defs/union_02022594.h
deleted file mode 100644
index 5a9e5ad41b..0000000000
--- a/include/struct_defs/union_02022594.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef POKEPLATINUM_UNION_02022594_H
-#define POKEPLATINUM_UNION_02022594_H
-
-typedef union {
-    struct {
-        u8 unk_00;
-        u8 unk_01;
-        u8 unk_02;
-        u8 unk_03;
-    } val1;
-
-    struct {
-        u8 unk_00;
-        u8 unk_01;
-        u8 unk_02;
-        u8 unk_03;
-    } val2;
-} TouchScreenRect, TouchScreenHitTable;
-
-#endif // POKEPLATINUM_UNION_02022594_H
diff --git a/include/struct_defs/union_02022594_020225E0.h b/include/struct_defs/union_02022594_020225E0.h
deleted file mode 100644
index a377139918..0000000000
--- a/include/struct_defs/union_02022594_020225E0.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef POKEPLATINUM_UNION_02022594_020225E0_H
-#define POKEPLATINUM_UNION_02022594_020225E0_H
-
-typedef union {
-    struct {
-        u8 unk_00;
-        u8 unk_01;
-        u8 unk_02;
-        u8 unk_03;
-    } val1;
-
-    struct {
-        u8 unk_00;
-        u8 unk_01;
-        u8 unk_02;
-        u8 unk_03;
-    } val2;
-} TouchScreenRect, TouchScreenHitTable;
-
-#endif // POKEPLATINUM_UNION_02022594_020225E0_H
diff --git a/include/touch_screen.h b/include/touch_screen.h
index d1f70808e3..d13ca13864 100644
--- a/include/touch_screen.h
+++ b/include/touch_screen.h
@@ -3,6 +3,12 @@
 
 #define TOUCHSCREEN_USE_CIRCLE 0xfe
 
+/** 
+ * These two structs represent regions that can be checked on the touch screen.
+ * The first struct, TouchScreenRect, is for strictly rectangular regions.
+ * The second struct, TouchScreenHitTable, is for rectangles OR circles.
+ * To enable circle mode, set the 'code' value to TOUCHSCREEN_USE_CIRCLE.
+*/
 typedef union {
     struct {
         u8 top;
diff --git a/src/overlay025/poketch_button.c b/src/overlay025/poketch_button.c
index b7a930c731..67ed54b3c6 100644
--- a/src/overlay025/poketch_button.c
+++ b/src/overlay025/poketch_button.c
@@ -8,7 +8,7 @@
 #include "heap.h"
 
 static void PoketchButton_Init(PoketchButton *button);
-static void PoketchButton_ChangeState(PoketchButton *button, u32 state);
+static void PoketchButton_ChangeState(PoketchButton *button, enum ButtonEventState state);
 static void PoketchButton_IncrementTimer(PoketchButton *button);
 static u32 PoketchButton_CheckTimers(PoketchButton *button);
 static u32 Button_OnIdle(PoketchButton *button, BOOL touched, BOOL tapped);
@@ -17,13 +17,11 @@ static u32 Button_OnCheckDoubleTap(PoketchButton *button, BOOL touched, BOOL tap
 static u32 Button_OnDoubleTap(PoketchButton *button, BOOL touched, BOOL tapped);
 static u32 Button_OnReset(PoketchButton *button, BOOL touched, BOOL tapped);
 
-PoketchButtonManager* PoketchButtonManager_Create(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID)
+PoketchButtonManager* PoketchButtonManager_New(const TouchScreenHitTable *hitTable, u32 numButtons, PoketchButtonCallback callback, void *callbackData, u32 heapID)
 {
-    PoketchButtonManager *buttonManager;
-
     GF_ASSERT(numButtons > 0);
 
-    buttonManager = Heap_AllocFromHeap(heapID, sizeof(PoketchButtonManager));
+    PoketchButtonManager *buttonManager = Heap_AllocFromHeap(heapID, sizeof(PoketchButtonManager));
 
     if (buttonManager) {
         buttonManager->heapID = heapID;
@@ -46,7 +44,7 @@ PoketchButtonManager* PoketchButtonManager_Create(const TouchScreenHitTable *hit
     return buttonManager;
 }
 
-void PoketchButtonManager_Destroy(PoketchButtonManager *buttonManager)
+void PoketchButtonManager_Free(PoketchButtonManager *buttonManager)
 {
     GF_ASSERT(buttonManager);
     Heap_FreeToHeapExplicit(buttonManager->heapID, buttonManager->buttons);
@@ -66,7 +64,7 @@ static ButtonEvent sButtonEvents = {
 void PoketchButtonManager_Update(PoketchButtonManager *buttonManager)
 {
     BOOL touched, tapped;
-    u32 i, button_state, touch_state;
+    u32 i, buttonState, touchState;
 
     touched = TouchScreen_Touched();
 
@@ -95,17 +93,17 @@ void PoketchButtonManager_Update(PoketchButtonManager *buttonManager)
 
     // Call Buttons's state machine function, and then optionally the button manager's currently set callback after that.
     for (i = 0; i < buttonManager->numButtons; i++) {
-        button_state = sButtonEvents[buttonManager->buttons[i].state](&buttonManager->buttons[i], touched, tapped);
+        buttonState = sButtonEvents[buttonManager->buttons[i].state](&buttonManager->buttons[i], touched, tapped);
 
         if (buttonManager->buttons[i].screenTouched != buttonManager->buttons[i].prevScreenTouched) {
-            touch_state = buttonManager->buttons[i].screenTouched;
+            touchState = buttonManager->buttons[i].screenTouched;
         } else {
-            touch_state = BUTTON_TOUCH_DOWN;
+            touchState = BUTTON_TOUCH_DOWN;
         }
 
         // We only call the button manager's callback once per update, and only if a button's state changed
-        if ((button_state != BUTTON_MANAGER_STATE_NULL) || (touch_state != BUTTON_TOUCH_DOWN)) {
-            buttonManager->callback(i, button_state, touch_state, buttonManager->buttonCallbackData);
+        if (buttonState != BUTTON_MANAGER_STATE_NULL || touchState != BUTTON_TOUCH_DOWN) {
+            buttonManager->callback(i, buttonState, touchState, buttonManager->buttonCallbackData);
             break;
         }
     }
@@ -116,12 +114,12 @@ void PoketchButtonManager_Update(PoketchButtonManager *buttonManager)
     }
 }
 
-void PoketchButtonManager_ButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time)
+void PoketchButtonManager_SetButtonTimer(PoketchButtonManager *buttonManager, u32 buttonIndex, u32 timerIndex, u16 time)
 {
     buttonManager->buttons[buttonIndex].timerDurations[timerIndex] = time;
 }
 
-void PoketchButtonManager_RepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime)
+void PoketchButtonManager_SetRepeatTime(PoketchButtonManager *buttonManager, u32 index, u16 repeatTime)
 {
     buttonManager->buttons[index].repeatTime = repeatTime;
 }
@@ -148,14 +146,14 @@ static void PoketchButton_Init(PoketchButton *button)
 }
 
 /** Use enum ButtonEventState for state input. */
-static void PoketchButton_ChangeState(PoketchButton *button, u32 state)
+static void PoketchButton_ChangeState(PoketchButton *button, enum ButtonEventState state)
 {
     button->state = state;
     button->timer = 0;
 }
 
 /** Use enum ButtonEventState for state input. */
-static void PoketchButton_ChangeState_NoReset(PoketchButton *button, u32 state)
+static void PoketchButton_ChangeState_NoReset(PoketchButton *button, enum ButtonEventState state)
 {
     button->state = state;
 }
diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c
index a21fb1180a..925043749e 100644
--- a/src/overlay025/poketch_system.c
+++ b/src/overlay025/poketch_system.c
@@ -560,10 +560,10 @@ static BOOL ov25_02254284 (PoketchSystem *poketchSys)
         {16, 175, 16, 207}
     };
 
-    poketchSys->unk_28 = PoketchButtonManager_Create(v0, NELEMS(v0), ov25_022542E4, poketchSys, 7);
+    poketchSys->unk_28 = PoketchButtonManager_New(v0, NELEMS(v0), ov25_022542E4, poketchSys, 7);
 
     if (poketchSys->unk_28 != NULL) {
-        PoketchButtonManager_ButtonTimer(poketchSys->unk_28, 0, 0, 7);
+        PoketchButtonManager_SetButtonTimer(poketchSys->unk_28, 0, 0, 7);
         poketchSys->unk_2C = 0xffffffff;
         poketchSys->unk_30 = 0xffffffff;
         return 1;
@@ -574,7 +574,7 @@ static BOOL ov25_02254284 (PoketchSystem *poketchSys)
 
 static void ov25_022542C8 (PoketchSystem *poketchSys)
 {
-    PoketchButtonManager_Destroy(poketchSys->unk_28);
+    PoketchButtonManager_Free(poketchSys->unk_28);
 }
 
 static void ov25_022542D4 (PoketchSystem *poketchSys)
diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c
index 5a69aff6f0..7a537c57bb 100644
--- a/src/overlay026/ov26_022561C0.c
+++ b/src/overlay026/ov26_022561C0.c
@@ -96,7 +96,7 @@ static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, PoketchSystem * par
 
         param0->unk_06 = param0->unk_14.unk_00.minute;
         param0->unk_05 = param0->unk_14.unk_00.hour;
-        param0->unk_10 = PoketchButtonManager_Create(Unk_ov26_02256718, NELEMS(Unk_ov26_02256718), ov26_02256300, param0, 8);
+        param0->unk_10 = PoketchButtonManager_New(Unk_ov26_02256718, NELEMS(Unk_ov26_02256718), ov26_02256300, param0, 8);
 
         if (param0->unk_10 == NULL) {
             return 0;
@@ -112,7 +112,7 @@ static BOOL ov26_0225621C (UnkStruct_ov26_0225621C * param0, PoketchSystem * par
 static void ov26_022562A4 (UnkStruct_ov26_0225621C * param0)
 {
     ov26_0225649C(param0->unk_24);
-    PoketchButtonManager_Destroy(param0->unk_10);
+    PoketchButtonManager_Free(param0->unk_10);
     Heap_FreeToHeap(param0);
 }
 
diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c
index 8db898c8d2..ed7c0b036e 100644
--- a/src/overlay027/ov27_022561C0.c
+++ b/src/overlay027/ov27_022561C0.c
@@ -375,11 +375,11 @@ static BOOL ov27_02256608 (UnkStruct_ov27_0225621C * param0)
         {0xfe, 112, 112, 39},
     };
 
-    param0->unk_5C = PoketchButtonManager_Create(v0, NELEMS(v0), ov27_02256660, param0, 8);
+    param0->unk_5C = PoketchButtonManager_New(v0, NELEMS(v0), ov27_02256660, param0, 8);
 
     if (param0->unk_5C != NULL) {
-        PoketchButtonManager_ButtonTimer(param0->unk_5C, 0, 0, 15);
-        PoketchButtonManager_ButtonTimer(param0->unk_5C, 0, 1, 75);
+        PoketchButtonManager_SetButtonTimer(param0->unk_5C, 0, 0, 15);
+        PoketchButtonManager_SetButtonTimer(param0->unk_5C, 0, 1, 75);
         param0->unk_04 = 0;
         return 1;
     }
@@ -389,7 +389,7 @@ static BOOL ov27_02256608 (UnkStruct_ov27_0225621C * param0)
 
 static void ov27_02256654 (UnkStruct_ov27_0225621C * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_5C);
+    PoketchButtonManager_Free(param0->unk_5C);
 }
 
 static void ov27_02256660 (u32 param0, u32 param1, u32 param2, void * param3)
diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c
index 527d5ac1b5..676a628df3 100644
--- a/src/overlay028/ov28_022561C0.c
+++ b/src/overlay028/ov28_022561C0.c
@@ -117,7 +117,7 @@ static BOOL ov28_02256210 (UnkStruct_ov28_02256210 * param0, u32 param1, BGL * p
             return 0;
         }
 
-        param0->unk_0C = PoketchButtonManager_Create(Unk_ov28_02257658, NELEMS(Unk_ov28_02257658), ov28_02256344, param0, 8);
+        param0->unk_0C = PoketchButtonManager_New(Unk_ov28_02257658, NELEMS(Unk_ov28_02257658), ov28_02256344, param0, 8);
 
         if (param0->unk_0C == NULL) {
             return 0;
@@ -142,7 +142,7 @@ static void ov28_02256298 (UnkStruct_ov28_02256210 * param0)
     }
 
     if (param0->unk_0C) {
-        PoketchButtonManager_Destroy(param0->unk_0C);
+        PoketchButtonManager_Free(param0->unk_0C);
     }
 
     ov28_022569AC(param0->unk_14);
diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c
index 8de890cd17..d88cd20fcf 100644
--- a/src/overlay029/ov29_022561C0.c
+++ b/src/overlay029/ov29_022561C0.c
@@ -85,7 +85,7 @@ static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, PoketchSystem * par
         param0->unk_01 = 0;
         param0->unk_02 = 0;
         param0->unk_03 = 0;
-        param0->unk_16FC = PoketchButtonManager_Create(Unk_ov29_02256B3C, NELEMS(Unk_ov29_02256B3C), ov29_022562F4, param0, 8);
+        param0->unk_16FC = PoketchButtonManager_New(Unk_ov29_02256B3C, NELEMS(Unk_ov29_02256B3C), ov29_022562F4, param0, 8);
         param0->unk_16F8 = param1;
 
         return 1;
@@ -96,7 +96,7 @@ static BOOL ov29_0225621C (UnkStruct_ov29_0225621C * param0, PoketchSystem * par
 
 static void ov29_02256288 (UnkStruct_ov29_0225621C * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_16FC);
+    PoketchButtonManager_Free(param0->unk_16FC);
     ov29_02256770(param0->unk_16F4);
     Heap_FreeToHeap(param0);
 }
diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c
index bc60e75ff6..d414c8a1cc 100644
--- a/src/overlay030/ov30_022561C0.c
+++ b/src/overlay030/ov30_022561C0.c
@@ -93,7 +93,7 @@ static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, PoketchSystem * par
         }
 
         param0->unk_05 = param0->unk_14.unk_00.minute;
-        param0->unk_10 = PoketchButtonManager_Create(Unk_ov30_02256678, NELEMS(Unk_ov30_02256678), ov30_022562F4, param0, 8);
+        param0->unk_10 = PoketchButtonManager_New(Unk_ov30_02256678, NELEMS(Unk_ov30_02256678), ov30_022562F4, param0, 8);
 
         if (param0->unk_10 == NULL) {
             return 0;
@@ -109,7 +109,7 @@ static BOOL ov30_0225621C (UnkStruct_ov30_0225621C * param0, PoketchSystem * par
 static void ov30_02256298 (UnkStruct_ov30_0225621C * param0)
 {
     ov30_02256444(param0->unk_24);
-    PoketchButtonManager_Destroy(param0->unk_10);
+    PoketchButtonManager_Free(param0->unk_10);
     Heap_FreeToHeap(param0);
 }
 
diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c
index 4803d75a49..b3e599352f 100644
--- a/src/overlay035/ov35_022561C0.c
+++ b/src/overlay035/ov35_022561C0.c
@@ -87,7 +87,7 @@ static BOOL ov35_0225621C (UnkStruct_ov35_0225621C * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_02 = 0;
-        param0->unk_18 = PoketchButtonManager_Create(v0, NELEMS(v0), ov35_02256284, param0, 8);
+        param0->unk_18 = PoketchButtonManager_New(v0, NELEMS(v0), ov35_02256284, param0, 8);
         param0->unk_1C = 0;
         param0->unk_14 = param1;
 
@@ -109,7 +109,7 @@ static void ov35_02256284 (u32 param0, u32 param1, u32 param2, void * param3)
 static void ov35_0225628C (UnkStruct_ov35_0225621C * param0)
 {
     sub_02099D54(param0->unk_04, (u8 *)(&(param0->unk_08.unk_00)), sizeof(u32));
-    PoketchButtonManager_Destroy(param0->unk_18);
+    PoketchButtonManager_Free(param0->unk_18);
     ov35_0225644C(param0->unk_10);
     Heap_FreeToHeap(param0);
 }
diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c
index 087f546e09..4f195982a2 100644
--- a/src/overlay036/ov36_022561C0.c
+++ b/src/overlay036/ov36_022561C0.c
@@ -82,7 +82,7 @@ static BOOL ov36_0225621C (UnkStruct_ov36_0225621C * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_02 = 0;
-        param0->unk_14 = PoketchButtonManager_Create(v0, NELEMS(v0), ov36_02256278, param0, 8);
+        param0->unk_14 = PoketchButtonManager_New(v0, NELEMS(v0), ov36_02256278, param0, 8);
         param0->unk_18 = 0;
 
         return 1;
@@ -102,7 +102,7 @@ static void ov36_02256278 (u32 param0, u32 param1, u32 param2, void * param3)
 
 static void ov36_02256280 (UnkStruct_ov36_0225621C * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_14);
+    PoketchButtonManager_Free(param0->unk_14);
     ov36_02256440(param0->unk_0C);
 
     Heap_FreeToHeap(param0);
diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c
index 8d0ae823c9..683c007704 100644
--- a/src/overlay037/ov37_022561C0.c
+++ b/src/overlay037/ov37_022561C0.c
@@ -78,7 +78,7 @@ static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_02 = 0;
-        param0->unk_10 = PoketchButtonManager_Create(v0, NELEMS(v0), ov37_02256298, param0, 8);
+        param0->unk_10 = PoketchButtonManager_New(v0, NELEMS(v0), ov37_02256298, param0, 8);
         param0->unk_14 = 0;
         param0->unk_0C = param1;
 
@@ -90,7 +90,7 @@ static BOOL ov37_0225621C (UnkStruct_ov37_0225621C * param0, PoketchSystem * par
 
 static void ov37_02256280 (UnkStruct_ov37_0225621C * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_10);
+    PoketchButtonManager_Free(param0->unk_10);
     ov37_02256410(param0->unk_08);
     Heap_FreeToHeap(param0);
 }
diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c
index 6392ac56c4..57b191cf18 100644
--- a/src/overlay039/ov39_022561C0.c
+++ b/src/overlay039/ov39_022561C0.c
@@ -80,7 +80,7 @@ static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem * par
         param0->unk_01 = 0;
         param0->unk_02 = 0;
         param0->unk_28 = param1;
-        param0->unk_2C = PoketchButtonManager_Create(v0, NELEMS(v0), ov39_02256284, param0, 8);
+        param0->unk_2C = PoketchButtonManager_New(v0, NELEMS(v0), ov39_02256284, param0, 8);
         param0->unk_30 = 0;
 
         for (v1 = 0; v1 < 6; v1++) {
@@ -96,7 +96,7 @@ static BOOL ov39_0225621C (UnkStruct_ov39_0225621C * param0, PoketchSystem * par
 static void ov39_02256268 (UnkStruct_ov39_0225621C * param0)
 {
     if (param0->unk_2C) {
-        PoketchButtonManager_Destroy(param0->unk_2C);
+        PoketchButtonManager_Free(param0->unk_2C);
     }
 
     ov39_0225640C(param0->unk_24);
diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c
index ee2d06095e..a71730d0fb 100644
--- a/src/overlay041/ov41_022561C0.c
+++ b/src/overlay041/ov41_022561C0.c
@@ -89,7 +89,7 @@ static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem * par
 
         ov41_02256790(&param0->unk_04);
 
-        param0->unk_5B84 = PoketchButtonManager_Create(v0, NELEMS(v0), ov41_02256300, param0, 8);
+        param0->unk_5B84 = PoketchButtonManager_New(v0, NELEMS(v0), ov41_02256300, param0, 8);
         param0->unk_5B88 = 0;
         param0->unk_5B80 = param1;
 
@@ -101,7 +101,7 @@ static BOOL ov41_02256220 (UnkStruct_ov41_02256220 * param0, PoketchSystem * par
 
 static void ov41_02256294 (UnkStruct_ov41_02256220 * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_5B84);
+    PoketchButtonManager_Free(param0->unk_5B84);
     ov41_022567F8(param0->unk_5B7C);
     Heap_FreeToHeap(param0);
 }
diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c
index ebd4324f77..3770a99b7a 100644
--- a/src/overlay043/ov43_022561C0.c
+++ b/src/overlay043/ov43_022561C0.c
@@ -88,7 +88,7 @@ static BOOL ov43_0225621C (UnkStruct_ov43_0225621C * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_02 = 0;
-        param0->unk_1C = PoketchButtonManager_Create(v0, NELEMS(v0), ov43_02256308, param0, 8);
+        param0->unk_1C = PoketchButtonManager_New(v0, NELEMS(v0), ov43_02256308, param0, 8);
         param0->unk_20 = 0;
         param0->unk_18 = param1;
 
@@ -110,7 +110,7 @@ static void ov43_02256288 (UnkStruct_ov43_02256544_1 * param0)
 static void ov43_022562A8 (UnkStruct_ov43_0225621C * param0)
 {
     sub_02099D54(param0->unk_04, &(param0->unk_08), sizeof(param0->unk_08));
-    PoketchButtonManager_Destroy(param0->unk_1C);
+    PoketchButtonManager_Free(param0->unk_1C);
     ov43_02256680(param0->unk_14);
     Heap_FreeToHeap(param0);
 }
diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c
index f16205a100..8f87f455d9 100644
--- a/src/overlay044/ov44_022561C0.c
+++ b/src/overlay044/ov44_022561C0.c
@@ -110,7 +110,7 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_02 = 0;
-        param0->unk_40 = PoketchButtonManager_Create(v4, NELEMS(v4), ov44_0225632C, param0, 8);
+        param0->unk_40 = PoketchButtonManager_New(v4, NELEMS(v4), ov44_0225632C, param0, 8);
         param0->unk_46 = 0;
         param0->unk_3C = param1;
 
@@ -122,7 +122,7 @@ static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, PoketchSystem * par
 
 static void ov44_02256314 (UnkStruct_ov44_0225621C * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_40);
+    PoketchButtonManager_Free(param0->unk_40);
     ov44_022565F8(param0->unk_38);
     Heap_FreeToHeap(param0);
 }
diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c
index 7d058b1dfc..ca5909cd93 100644
--- a/src/overlay045/ov45_022561C0.c
+++ b/src/overlay045/ov45_022561C0.c
@@ -102,13 +102,13 @@ static BOOL ov45_0225621C (UnkStruct_ov45_022561D4 * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_02 = 0;
-        param0->unk_14 = PoketchButtonManager_Create(v0, NELEMS(v0), ov45_02256310, param0, 8);
+        param0->unk_14 = PoketchButtonManager_New(v0, NELEMS(v0), ov45_02256310, param0, 8);
         param0->unk_1C = 0;
 
-        PoketchButtonManager_RepeatTime(param0->unk_14, 2, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_14, 3, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_14, 4, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_14, 5, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_14, 2, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_14, 3, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_14, 4, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_14, 5, 4);
 
         param0->unk_2C = 0;
         param0->unk_30 = 0;
@@ -140,7 +140,7 @@ static void ov45_022562C0 (UnkStruct_ov45_022566EC_1 * param0)
 
 static void ov45_022562F8 (UnkStruct_ov45_022561D4 * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_14);
+    PoketchButtonManager_Free(param0->unk_14);
     ov45_02256728(param0->unk_08);
 
     Heap_FreeToHeap(param0);
diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c
index e2ece14c31..2b4dcb7a36 100644
--- a/src/overlay046/ov46_022561C0.c
+++ b/src/overlay046/ov46_022561C0.c
@@ -196,17 +196,17 @@ static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_03 = 0;
-        param0->unk_10 = PoketchButtonManager_Create(v0, NELEMS(v0), ov46_022563D8, param0, 8);
+        param0->unk_10 = PoketchButtonManager_New(v0, NELEMS(v0), ov46_022563D8, param0, 8);
         param0->unk_18 = 0;
 
-        PoketchButtonManager_RepeatTime(param0->unk_10, 3, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_10, 5, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_10, 4, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_10, 6, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_10, 7, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_10, 9, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_10, 8, 4);
-        PoketchButtonManager_RepeatTime(param0->unk_10, 10, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_10, 3, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_10, 5, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_10, 4, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_10, 6, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_10, 7, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_10, 9, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_10, 8, 4);
+        PoketchButtonManager_SetRepeatTime(param0->unk_10, 10, 4);
 
         param0->unk_0C = param1;
         return 1;
@@ -218,7 +218,7 @@ static BOOL ov46_02256310 (UnkStruct_ov46_0225621C * param0, PoketchSystem * par
 static void ov46_022563B8 (UnkStruct_ov46_0225621C * param0)
 {
     ov46_02256270(param0, &param0->unk_48);
-    PoketchButtonManager_Destroy(param0->unk_10);
+    PoketchButtonManager_Free(param0->unk_10);
     ov46_02256C0C(param0->unk_08);
 
     Heap_FreeToHeap(param0);
diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c
index 03d19c6047..9c2cde18cc 100644
--- a/src/overlay050/ov50_022561C0.c
+++ b/src/overlay050/ov50_022561C0.c
@@ -123,7 +123,7 @@ static BOOL ov50_0225621C (UnkStruct_ov50_022561D4 * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_02 = 0;
-        param0->unk_9C = PoketchButtonManager_Create(v0, NELEMS(v0), ov50_02256360, param0, 8);
+        param0->unk_9C = PoketchButtonManager_New(v0, NELEMS(v0), ov50_02256360, param0, 8);
         param0->unk_A0 = 0;
         param0->unk_94 = param1;
 
@@ -165,7 +165,7 @@ static void ov50_022562AC (UnkStruct_ov50_02256510_1 * param0, UnkStruct_ov50_02
 
 static void ov50_02256340 (UnkStruct_ov50_022561D4 * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_9C);
+    PoketchButtonManager_Free(param0->unk_9C);
     ov50_0225654C(param0->unk_90);
 
     Heap_FreeToHeap(param0);
diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c
index c4d488a046..60b459ead6 100644
--- a/src/overlay053/ov53_022561C0.c
+++ b/src/overlay053/ov53_022561C0.c
@@ -110,7 +110,7 @@ static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_02 = 0;
-        param0->unk_34 = PoketchButtonManager_Create(v0, NELEMS(v0), ov53_02256314, param0, 8);
+        param0->unk_34 = PoketchButtonManager_New(v0, NELEMS(v0), ov53_02256314, param0, 8);
         param0->unk_38 = 0;
         param0->unk_3C = 0;
         param0->unk_30 = param1;
@@ -123,7 +123,7 @@ static BOOL ov53_0225621C (UnkStruct_ov53_0225621C * param0, PoketchSystem * par
 
 static void ov53_022562B8 (UnkStruct_ov53_0225621C * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_34);
+    PoketchButtonManager_Free(param0->unk_34);
     ov53_02256454(param0->unk_2C);
 
     Heap_FreeToHeap(param0);
diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c
index e5a2de1196..6c8e7d9464 100644
--- a/src/overlay054/ov54_022561C0.c
+++ b/src/overlay054/ov54_022561C0.c
@@ -155,7 +155,7 @@ static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem * par
         param0->unk_00 = 0;
         param0->unk_01 = 0;
         param0->unk_02 = 0;
-        param0->unk_A0 = PoketchButtonManager_Create(v0, NELEMS(v0), ov54_02256340, param0, 8);
+        param0->unk_A0 = PoketchButtonManager_New(v0, NELEMS(v0), ov54_02256340, param0, 8);
         param0->unk_A4 = 0;
         param0->unk_A8 = 0;
         param0->unk_9C = param1;
@@ -168,7 +168,7 @@ static BOOL ov54_0225621C (UnkStruct_ov54_0225621C * param0, PoketchSystem * par
 
 static void ov54_022562D4 (UnkStruct_ov54_0225621C * param0)
 {
-    PoketchButtonManager_Destroy(param0->unk_A0);
+    PoketchButtonManager_Free(param0->unk_A0);
     ov54_02256460(param0->unk_98);
 
     Heap_FreeToHeap(param0);