diff --git a/entity/ibp.go b/entity/ibp.go
index 1e578f7..ece73f5 100644
--- a/entity/ibp.go
+++ b/entity/ibp.go
@@ -94,13 +94,13 @@ func LoadSPKEntity(w ecs.World, entry *ecs.Entry, spkData *repository.IBPRefMap,
 	for _, key := range spkData.Keys() {
 		e := NewIBPKeyEntity(w, key.Id(), entityMap)
 		switch key.Code() {
-		case "SPKS1":
+		case "SPKSX1J":
 			spk.SPKSX1J_KEY = e
-		case "SPKS3":
+		case "SPKSX3J":
 			spk.SPKSX3J_KEY = e
-		case "SPKS2":
+		case "SPKSS2J":
 			spk.SPKSS2J_KEY = e
-		case "SPKS4":
+		case "SPKSS4J":
 			spk.SPKSS4J_KEY = e
 		}
 	}
@@ -162,9 +162,9 @@ func LoadEMPEntity(w ecs.World, entry *ecs.Entry, spkData *repository.IBPRefMap,
 			emp.EMP4_BTN = e
 		case "EMP6":
 			emp.EMP6_BTN = e
-		case "XEMPJ":
+		case "EMP-X":
 			emp.EMPX_BTN = e
-		case "SEMPJ":
+		case "EMP-S":
 			emp.EMPS_BTN = e
 		case "XEMPFA":
 			emp.XEMPFA_BTN = e