diff --git a/src/main/java/icu/samnyan/aqua/net/games/ongeki/OngekiImport.kt b/src/main/java/icu/samnyan/aqua/net/games/ongeki/OngekiImport.kt
index 92a55003..af76f2f3 100644
--- a/src/main/java/icu/samnyan/aqua/net/games/ongeki/OngekiImport.kt
+++ b/src/main/java/icu/samnyan/aqua/net/games/ongeki/OngekiImport.kt
@@ -16,7 +16,7 @@ import kotlin.reflect.full.declaredMembers
 @RestController
 @API("api/v2/game/ongeki")
 class OngekiImport(
-    val repos: OngekiRepos,
+    val repos: OngekiUserRepos,
 ) : ImportController<OngekiDataExport, UserData>(
     "SDDT", "ongeki", OngekiDataExport::class,
     exportFields = OngekiDataExport::class.vars().associateBy {
@@ -27,7 +27,7 @@ class OngekiImport(
         .associateWith { OngekiUserRepos::class.declaredMembers
             .filter { f -> f returns OngekiUserLinked::class }
             .firstOrNull { f -> f.name == it.name
-                || f.name == (it.name.substring(4, 5).lowercase() + it.name.substring(5)) // strip user
+                || f.name == (it.name.substring(4, 5).lowercase() + it.name.substring(5)).replace("List", "") // strip user
                 || f.name == it.name.replace("List", "")
             }
             ?.call(repos) as OngekiUserLinked<*>? ?: error("No matching field found for ${it.name}")
@@ -35,42 +35,42 @@ class OngekiImport(
     artemisRenames = mapOf() // TODO (almost nobody uses this so it's very low priority)
 ) {
     override fun createEmpty() = OngekiDataExport()
-    override val userDataRepo = repos.u.data
+    override val userDataRepo = repos.data
 }
 
 
 data class OngekiDataExport(
     override var gameId: String = "SDDT",
     override var userData: UserData,
-    var userActivity: List<UserActivity>,
-    var userBoss: List<UserBoss>,
-    var userCard: List<UserCard>,
-    var userChapter: List<UserChapter>,
-    var userCharacter: List<UserCharacter>,
-    var userDeck: List<UserDeck>,
-    var userEventMusic: List<UserEventMusic>,
-    var userEventPoint: List<UserEventPoint>,
-    var userGeneralData: List<UserGeneralData>,
-    var userItem: List<UserItem>,
-    var userKop: List<UserKop>,
-    var userLoginBonus: List<UserLoginBonus>,
-    var userMemoryChapter: List<UserMemoryChapter>,
-    var userMissionPoint: List<UserMissionPoint>,
-    var userMusicDetail: List<UserMusicDetail>,
-    var userMusicItem: List<UserMusicItem>,
+    var userActivityList: List<UserActivity>,
+    var userBossList: List<UserBoss>,
+    var userCardList: List<UserCard>,
+    var userChapterList: List<UserChapter>,
+    var userCharacterList: List<UserCharacter>,
+    var userDeckList: List<UserDeck>,
+    var userEventMusicList: List<UserEventMusic>,
+    var userEventPointList: List<UserEventPoint>,
+    var userGeneralDataList: List<UserGeneralData>,
+    var userItemList: List<UserItem>,
+    var userKopList: List<UserKop>,
+    var userLoginBonusList: List<UserLoginBonus>,
+    var userMemoryChapterList: List<UserMemoryChapter>,
+    var userMissionPointList: List<UserMissionPoint>,
+    var userMusicDetailList: List<UserMusicDetail>,
+    var userMusicItemList: List<UserMusicItem>,
     var userOption: UserOption,
-    var userPlaylog: List<UserPlaylog>,
-    var userRival: List<UserRival>,
-    var userScenario: List<UserScenario>,
-    var userStory: List<UserStory>,
-    var userTechCount: List<UserTechCount>,
-    var userTechEvent: List<UserTechEvent>,
-    var userTradeItem: List<UserTradeItem>,
-    var userTrainingRoom: List<UserTrainingRoom>,
-    var userEventMap: List<UserEventMap>,
-    var userSkin: List<UserSkin>,
-    var userRegions: List<UserRegions>,
-    var userGacha: List<UserGacha>,
+    var userPlaylogList: List<UserPlaylog>,
+    var userRivalList: List<UserRival>,
+    var userScenarioList: List<UserScenario>,
+    var userStoryList: List<UserStory>,
+    var userTechCountList: List<UserTechCount>,
+    var userTechEventList: List<UserTechEvent>,
+    var userTradeItemList: List<UserTradeItem>,
+    var userTrainingRoomList: List<UserTrainingRoom>,
+    var userEventMapList: List<UserEventMap>,
+    var userSkinList: List<UserSkin>,
+    var userRegionsList: List<UserRegions>,
+    var userGachaList: List<UserGacha>,
 ): IExportClass<UserData> {
     constructor() : this("SDDT", UserData(), ArrayList(), ArrayList(), ArrayList(), ArrayList(),ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(),ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(),ArrayList(), ArrayList(), UserOption(), ArrayList(), ArrayList(),ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList(),ArrayList(), ArrayList(), ArrayList(), ArrayList(), ArrayList())
 }