diff --git a/src/enums/held-item-effect.ts b/src/enums/held-item-effect.ts
index 209a74b921e..52aeb13faec 100644
--- a/src/enums/held-item-effect.ts
+++ b/src/enums/held-item-effect.ts
@@ -1,4 +1,4 @@
-import type { EnumValues } from "#types/enum-types";
+import type { ObjectValues } from "#types/type-helpers";
 
 /**
  * Enum representing the various "classes" of item effects that can be applied.
@@ -34,4 +34,4 @@ export const HeldItemEffect = {
   INCREMENTING_STAT: 52,
 } as const;
 
-export type HeldItemEffect = EnumValues<typeof HeldItemEffect>;
+export type HeldItemEffect = ObjectValues<typeof HeldItemEffect>;
diff --git a/src/enums/held-item-id.ts b/src/enums/held-item-id.ts
index c112ab6f37a..91d1901cb4c 100644
--- a/src/enums/held-item-id.ts
+++ b/src/enums/held-item-id.ts
@@ -1,4 +1,4 @@
-import type { EnumValues } from "#types/enum-types";
+import type { ObjectValues } from "#types/type-helpers";
 
 // TODO: make category the lower 2 bytes
 export const HeldItemId = {
@@ -94,7 +94,7 @@ export const HeldItemId = {
   GIMMIGHOUL_EVO_TRACKER: 0x0A01,
 } as const;
 
-export type HeldItemId = EnumValues<typeof HeldItemId>;
+export type HeldItemId = ObjectValues<typeof HeldItemId>;
 
 type HeldItemNameMap = {
   [k in HeldItemName as (typeof HeldItemId)[k]]: k
@@ -127,7 +127,7 @@ export const HeldItemCategoryId = {
   EVO_TRACKER: 0x0A00,
 } as const;
 
-export type HeldItemCategoryId = EnumValues<typeof HeldItemCategoryId>;
+export type HeldItemCategoryId = ObjectValues<typeof HeldItemCategoryId>;
 
 const ITEM_CATEGORY_MASK = 0xFF00
 
diff --git a/src/enums/reward-id.ts b/src/enums/reward-id.ts
index 97a6a1f5747..145bad98914 100644
--- a/src/enums/reward-id.ts
+++ b/src/enums/reward-id.ts
@@ -1,4 +1,4 @@
-import type { EnumValues } from "#types/enum-types";
+import type { ObjectValues } from "#types/type-helpers";
 
 export const RewardId = {
   NONE: 0x0000,
@@ -69,7 +69,7 @@ export const RewardId = {
   RARE_FORM_CHANGE_ITEM: 0x2E02,
 } as const;
 
-export type RewardId = EnumValues<typeof RewardId>;
+export type RewardId = ObjectValues<typeof RewardId>;
 
 export const RewardCategoryId = {
   NONE: 0x0000,
@@ -90,7 +90,7 @@ export const RewardCategoryId = {
   FORM_CHANGE_ITEM: 0x0F00,
 } as const;
 
-export type RewardCategoryId = EnumValues<typeof RewardCategoryId>;
+export type RewardCategoryId = ObjectValues<typeof RewardCategoryId>;
 
 const ITEM_CATEGORY_MASK = 0xFF00
 
diff --git a/src/items/held-items/berry.ts b/src/items/held-items/berry.ts
index 0ce886c41fe..e0903778965 100644
--- a/src/items/held-items/berry.ts
+++ b/src/items/held-items/berry.ts
@@ -7,11 +7,11 @@ import { BerryUsedEvent } from "#events/battle-scene";
 import type { Pokemon } from "#field/pokemon";
 import { ConsumableHeldItem } from "#items/held-item";
 import { TrainerItemEffect } from "#items/trainer-item";
-import type { EnumValues } from "#types/enum-types";
+import type { ObjectValues } from "#types/type-helpers";
 import { BooleanHolder } from "#utils/common";
 
 type BerryTypeToHeldItemMap = {
-  [key in EnumValues<typeof BerryType>]: HeldItemId;
+  [key in ObjectValues<typeof BerryType>]: HeldItemId;
 };
 
 // TODO: Rework this to use a bitwise XOR