Library and module names are now correct in the NID JSON according to what psp2sdk has.

23 files changed, 211 insertions, 219 deletions

diff --git a/nids/360/SceAppMgr.yml b/nids/360/SceAppMgr.yml
index 8b7ebe9..9103c24 100644
--- a/nids/360/SceAppMgr.yml
+++ b/nids/360/SceAppMgr.yml
@@ -8,3 +8,10 @@ modules:
           sceAppMgrAcquireBgmPort: 0xAFCEAB96
           sceAppMgrReleaseBgmPort: 0xF3717E37
           sceAppMgrSetInfobarState: 0xAD9022A1
+      SceAppMgrUser:
+        nid: 0x00000004
+        functions:
+          _sceAppMgrGetAppState: 0x5E86319A
+          sceAppMgrLoadExec: 0xE6774ABC
+          sceAppMgrReceiveSystemEvent: 0x10B5765F
+          sceAppMgrSetNetworkDisconnectionWarningDialogState: 0xE352B29C
diff --git a/nids/360/SceAppMgrUser.yml b/nids/360/SceAppMgrUser.yml
deleted file mode 100644
index 4b33e2f..0000000
--- a/nids/360/SceAppMgrUser.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-modules:
-  SceAppMgrUser:
-    nid: 0x00000003
-    libraries:
-      SceAppMgrUser:
-        nid: 0x00000004
-        functions:
-          _sceAppMgrGetAppState: 0x5E86319A
-          sceAppMgrLoadExec: 0xE6774ABC
-          sceAppMgrReceiveSystemEvent: 0x10B5765F
-          sceAppMgrSetNetworkDisconnectionWarningDialogState: 0xE352B29C
diff --git a/nids/360/SceAudiodecUser.yml b/nids/360/SceAudiodec.yml
index 9158350..15d76ca 100644
--- a/nids/360/SceAudiodecUser.yml
+++ b/nids/360/SceAudiodec.yml
@@ -1,5 +1,5 @@
 modules:
-  SceAudiodecUser:
+  SceAudiodec:
     nid: 0x0000000D
     libraries:
       SceAudiodecUser:
diff --git a/nids/360/SceAudioencUser.yml b/nids/360/SceAudioenc.yml
index 2f8e9a9..36d5d70 100644
--- a/nids/360/SceAudioencUser.yml
+++ b/nids/360/SceAudioenc.yml
@@ -1,5 +1,5 @@
 modules:
-  SceAudioencUser:
+  SceAudioenc:
     nid: 0x0000000F
     libraries:
       SceAudioencUser:
diff --git a/nids/360/SceCodecEngine.yml b/nids/360/SceCodecEngine.yml
new file mode 100644
index 0000000..076332f
--- /dev/null
+++ b/nids/360/SceCodecEngine.yml
@@ -0,0 +1,11 @@
+modules:
+  SceCodecEngine:
+    nid: 0x00000019
+    libraries:
+      SceCodecEngineUser:
+        nid: 0x0000001A
+        functions:
+          sceCodecEngineAllocMemoryFromUnmapMemBlock: 0x1A3A53E5
+          sceCodecEngineCloseUnmapMemBlock: 0x95EA3B3E
+          sceCodecEngineFreeMemoryFromUnmapMemBlock: 0x6A31831D
+          sceCodecEngineOpenUnmapMemBlock: 0xF0B4C892
diff --git a/nids/360/SceCoredump.yml b/nids/360/SceCoredump.yml
index e07ac67..bae1831 100644
--- a/nids/360/SceCoredump.yml
+++ b/nids/360/SceCoredump.yml
@@ -7,3 +7,7 @@ modules:
         functions:
           sceCoredumpRegisterCoredumpHandler: 0x031DC61E
           sceCoredumpUnregisterCoredumpHandler: 0x6037A2C3
+      SceCoredumpNounlink:
+        nid: 0x00000020
+        functions:
+          sceCoredumpWriteUserData: 0xDF335DCF
diff --git a/nids/360/SceDisplay.yml b/nids/360/SceDisplay.yml
index b31c4fb..2db3e7d 100644
--- a/nids/360/SceDisplay.yml
+++ b/nids/360/SceDisplay.yml
@@ -17,3 +17,8 @@ modules:
           sceDisplayWaitVblankStartCB: 0x78B41B92
           sceDisplayWaitVblankStartMulti: 0xDD0A13B8
           sceDisplayWaitVblankStartMultiCB: 0x05F27764
+      SceDisplayUser:
+        nid: 0x00000034
+        functions:
+          sceDisplayGetFrameBuf: 0x42AE6BBC
+          sceDisplaySetFrameBuf: 0x7A410B64
diff --git a/nids/360/SceDisplayUser.yml b/nids/360/SceDisplayUser.yml
deleted file mode 100644
index 2a23212..0000000
--- a/nids/360/SceDisplayUser.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-modules:
-  SceDisplayUser:
-    nid: 0x00000033
-    libraries:
-      SceDisplayUser:
-        nid: 0x00000034
-        functions:
-          sceDisplayGetFrameBuf: 0x42AE6BBC
-          sceDisplaySetFrameBuf: 0x7A410B64
diff --git a/nids/360/SceIofilemgr.yml b/nids/360/SceIofilemgr.yml
deleted file mode 100644
index 8585210..0000000
--- a/nids/360/SceIofilemgr.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-modules:
-  SceIofilemgr:
-    nid: 0x0000004B
-    libraries:
-      SceIofilemgr:
-        nid: 0x0000004C
-        functions:
-          sceIoClose: 0xC70B8886
-          sceIoDclose: 0x422A221A
-          sceIoGetPriority: 0xF2A472A1
-          sceIoGetProcessDefaultPriority: 0x0DC4F1BB
-          sceIoGetThreadDefaultPriority: 0xA176CD03
-          sceIoLseek32: 0x49252B9B
-          sceIoRead: 0xFDB32293
-          sceIoSetPriority: 0x14B2D56C
-          sceIoSetProcessDefaultPriority: 0x7F2ABBAF
-          sceIoSetThreadDefaultPriority: 0x49312108
-          sceIoSyncByFd: 0x16512F59
-          sceIoWrite: 0x34EFD876
diff --git a/nids/360/SceJpegUser.yml b/nids/360/SceJpeg.yml
index 031787e..1a1ffee 100644
--- a/nids/360/SceJpegUser.yml
+++ b/nids/360/SceJpeg.yml
@@ -1,5 +1,5 @@
 modules:
-  SceJpegUser:
+  SceJpeg:
     nid: 0x0000004F
     libraries:
       SceJpegUser:
diff --git a/nids/360/SceJpegEncUser.yml b/nids/360/SceJpegEnc.yml
index 61904be..da250a2 100644
--- a/nids/360/SceJpegEncUser.yml
+++ b/nids/360/SceJpegEnc.yml
@@ -1,5 +1,5 @@
 modules:
-  SceJpegEncUser:
+  SceJpegEnc:
     nid: 0x0000004D
     libraries:
       SceJpegEncUser:
diff --git a/nids/360/SceLibKernel.yml b/nids/360/SceKernel.yml
index 3173506..5ec57cd 100644
--- a/nids/360/SceLibKernel.yml
+++ b/nids/360/SceKernel.yml
@@ -1,7 +1,35 @@
 modules:
-  SceLibKernel:
+  SceKernel:
     nid: 0x00000051
     libraries:
+      SceCpu:
+        nid: 0x00000022
+      SceDebugLed:
+        nid: 0x0000002A
+        functions:
+          sceKernelGetGPI: 0x14F582CF
+          sceKernelSetGPO: 0x78E702D3
+      SceDipsw:
+        nid: 0x00000030
+        functions:
+          sceKernelCheckDipsw: 0x1C783FB2
+          sceKernelClearDipsw: 0x800EDCC1
+          sceKernelSetDipsw: 0x817053D4
+      SceIofilemgr:
+        nid: 0x0000004C
+        functions:
+          sceIoClose: 0xC70B8886
+          sceIoDclose: 0x422A221A
+          sceIoGetPriority: 0xF2A472A1
+          sceIoGetProcessDefaultPriority: 0x0DC4F1BB
+          sceIoGetThreadDefaultPriority: 0xA176CD03
+          sceIoLseek32: 0x49252B9B
+          sceIoRead: 0xFDB32293
+          sceIoSetPriority: 0x14B2D56C
+          sceIoSetProcessDefaultPriority: 0x7F2ABBAF
+          sceIoSetThreadDefaultPriority: 0x49312108
+          sceIoSyncByFd: 0x16512F59
+          sceIoWrite: 0x34EFD876
       SceLibKernel:
         nid: 0x00000052
         functions:
@@ -268,3 +296,107 @@ modules:
           sceKernelWaitThreadEnd: 0xDDB395A9
           sceKernelWaitThreadEndCB: 0xC54941ED
           sceSblACMgrIsGameProgram: 0x963F4A99
+      SceModulemgr:
+        nid: 0x00000066
+        functions:
+          sceKernelGetModuleIdByAddr: 0xF5798C7C
+          sceKernelGetModuleInfo: 0x36585DAF
+          sceKernelGetModuleList: 0x2EF2581F
+      SceProcessmgr:
+        nid: 0x0000009E
+        functions:
+          sceKernelGetStderr: 0xFA5E3ADA
+          sceKernelGetStdin: 0xC1727F59
+          sceKernelGetStdout: 0xE5AA625C
+          sceKernelLibcClock: 0x9E45DA09
+          sceKernelLibcGettimeofday: 0x4B879059
+          sceKernelLibcGmtime_r: 0xBCA437CD
+          sceKernelLibcLocaltime_r: 0x94F041ED
+          sceKernelLibcMktime: 0x890BDC39
+          sceKernelLibcTime: 0x0039BE45
+          sceKernelPowerTick: 0x2252890C
+      SceSysmem:
+        nid: 0x000000DC
+        functions:
+          sceKernelAllocMemBlock: 0xB9D5EBDE
+          sceKernelFindMemBlockByAddr: 0xA33B99D1
+          sceKernelFreeMemBlock: 0xA91E15EE
+          sceKernelGetFreeMemorySize: 0x87CC580B
+          sceKernelGetMemBlockBase: 0xB8EF5818
+          sceKernelGetMemBlockInfoByAddr: 0x4010AD65
+          sceKernelGetMemBlockInfoByRange: 0x006F3DB4
+      SceThreadmgr:
+        nid: 0x000000E2
+        functions:
+          sceKernelCancelCallback: 0x30741EF2
+          sceKernelChangeActiveCpuMask: 0x001173F8
+          sceKernelChangeThreadCpuAffinityMask: 0x15129174
+          sceKernelChangeThreadPriority: 0xBD0139F2
+          sceKernelChangeThreadVfpException: 0xCC18FBAE
+          sceKernelCheckCallback: 0xE53E41F6
+          sceKernelCheckWaitableStatus: 0xD9BD74EB
+          sceKernelClearEvent: 0x7B2A4B28
+          sceKernelClearEventFlag: 0x4CB87CA7
+          sceKernelCloseCond: 0x15C690E0
+          sceKernelCloseEventFlag: 0x9A68F547
+          sceKernelCloseMsgPipe: 0x1305A065
+          sceKernelCloseMutex: 0x03E23AF6
+          sceKernelCloseRWLock: 0xFD5BD5C1
+          sceKernelCloseSema: 0xA2D81F9E
+          sceKernelCloseSimpleEvent: 0xFEF4CA53
+          sceKernelCloseTimer: 0xACE60E4A
+          sceKernelCreateCallback: 0xB19CF7E9
+          sceKernelCreateThreadForUser: 0xC0FAF6A3
+          sceKernelDelayThread: 0x4B675D05
+          sceKernelDelayThreadCB: 0x9C0180E1
+          sceKernelDeleteCallback: 0xD469676B
+          sceKernelDeleteCond: 0x879E6EBD
+          sceKernelDeleteEventFlag: 0x5840162C
+          sceKernelDeleteMsgPipe: 0xE78BCCF7
+          sceKernelDeleteMutex: 0xCB78710D
+          sceKernelDeleteRWLock: 0xE73649CA
+          sceKernelDeleteSema: 0xDB32948A
+          sceKernelDeleteSimpleEvent: 0x208CFE28
+          sceKernelDeleteThread: 0x1BBDE3D9
+          sceKernelDeleteTimer: 0xAB1E42C4
+          sceKernelExitDeleteThread: 0x1D17DECF
+          sceKernelGetCallbackCount: 0x038644D5
+          sceKernelGetProcessId: 0x9DCB4B7A
+          sceKernelGetThreadStackFreeSize: 0x4F8A3DA0
+          sceKernelGetThreadmgrUIDClass: 0xC9678F7F
+          sceKernelGetTimerBaseWide: 0x5DBC1960
+          sceKernelGetTimerTimeWide: 0x3EFD3165
+          sceKernelNotifyCallback: 0xA4683592
+          sceKernelOpenCond: 0x76BDA02F
+          sceKernelOpenEventFlag: 0xBC19F8A1
+          sceKernelOpenMsgPipe: 0x0E1CB9F6
+          sceKernelOpenMutex: 0x52E17182
+          sceKernelOpenRWLock: 0xCE510196
+          sceKernelOpenSema: 0xCBE235C7
+          sceKernelOpenSimpleEvent: 0x4E1E4DF8
+          sceKernelOpenTimer: 0xB6E286E7
+          sceKernelPollSema: 0x866EF048
+          sceKernelPulseEvent: 0x8D27BAD6
+          sceKernelRegisterCallbackToEvent: 0x76FB37E9
+          sceKernelSendSignal: 0xD4C367B2
+          sceKernelSetEvent: 0x324218CD
+          sceKernelSetEventFlag: 0xEC94DFF7
+          sceKernelSetTimerTimeWide: 0x273B4A4D
+          sceKernelSignalCond: 0x6ED2E2DC
+          sceKernelSignalCondAll: 0xC2E7AC22
+          sceKernelSignalCondTo: 0x1269F4EC
+          sceKernelSignalSema: 0xE6B761D1
+          sceKernelStartTimer: 0x48091E0C
+          sceKernelStopTimer: 0x869E9F20
+          sceKernelTryLockMutex: 0x72FC1F54
+          sceKernelTryLockReadRWLock: 0xEFDDA456
+          sceKernelTryLockWriteRWLock: 0x206CBB66
+          sceKernelUnlockMutex: 0x1A372EC8
+          sceKernelUnlockReadRWLock: 0x3EF91145
+          sceKernelUnlockWriteRWLock: 0xB4151397
+          sceKernelUnregisterCallbackFromEvent: 0x18462B11
+          sceKernelUnregisterCallbackFromEventAll: 0x888A7361
+      SceThreadmgrCoredumpTime:
+        nid: 0x000000E4
+        functions:
+          sceKernelExitThread: 0x0C8A38E1
diff --git a/nids/360/SceLiveAreaUtil.yml b/nids/360/SceLiveArea.yml
index e6d8b93..cecfa5b 100644
--- a/nids/360/SceLiveAreaUtil.yml
+++ b/nids/360/SceLiveArea.yml
@@ -1,5 +1,5 @@
 modules:
-  SceLiveAreaUtil:
+  SceLiveArea:
     nid: 0x00000061
     libraries:
       SceLiveAreaUtil:
diff --git a/nids/360/SceLibLocation.yml b/nids/360/SceLocation.yml
index d856410..70e10b9 100644
--- a/nids/360/SceLibLocation.yml
+++ b/nids/360/SceLocation.yml
@@ -1,5 +1,5 @@
 modules:
-  SceLibLocation:
+  SceLocation:
     nid: 0x00000053
     libraries:
       SceLibLocation:
diff --git a/nids/360/SceLibLocationExtension.yml b/nids/360/SceLocationExtension.yml
index 491587d..7ea940f 100644
--- a/nids/360/SceLibLocationExtension.yml
+++ b/nids/360/SceLocationExtension.yml
@@ -1,5 +1,5 @@
 modules:
-  SceLibLocationExtension:
+  SceLocationExtension:
     nid: 0x00000055
     libraries:
       SceLibLocationExtension:
diff --git a/nids/360/SceModulemgr.yml b/nids/360/SceModulemgr.yml
deleted file mode 100644
index edb41a3..0000000
--- a/nids/360/SceModulemgr.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-modules:
-  SceModulemgr:
-    nid: 0x00000065
-    libraries:
-      SceModulemgr:
-        nid: 0x00000066
-        functions:
-          sceKernelGetModuleIdByAddr: 0xF5798C7C
-          sceKernelGetModuleInfo: 0x36585DAF
-          sceKernelGetModuleList: 0x2EF2581F
diff --git a/nids/360/SceProcessmgr.yml b/nids/360/SceProcessmgr.yml
deleted file mode 100644
index 2389309..0000000
--- a/nids/360/SceProcessmgr.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-modules:
-  SceProcessmgr:
-    nid: 0x0000009D
-    libraries:
-      SceProcessmgr:
-        nid: 0x0000009E
-        functions:
-          sceKernelGetStderr: 0xFA5E3ADA
-          sceKernelGetStdin: 0xC1727F59
-          sceKernelGetStdout: 0xE5AA625C
-          sceKernelLibcClock: 0x9E45DA09
-          sceKernelLibcGettimeofday: 0x4B879059
-          sceKernelLibcGmtime_r: 0xBCA437CD
-          sceKernelLibcLocaltime_r: 0x94F041ED
-          sceKernelLibcMktime: 0x890BDC39
-          sceKernelLibcTime: 0x0039BE45
-          sceKernelPowerTick: 0x2252890C
diff --git a/nids/360/SceRtc.yml b/nids/360/SceRtc.yml
index cdf5877..83ad062 100644
--- a/nids/360/SceRtc.yml
+++ b/nids/360/SceRtc.yml
@@ -6,3 +6,46 @@ modules:
         nid: 0x000000A8
         functions:
           sceRtcGetAccumulativeTime: 0x258BE8EC
+      SceRtcUser:
+        nid: 0x000000AA
+        functions:
+          sceRtcCheckValid: 0xD7622935
+          sceRtcCompareTick: 0xC7385158
+          sceRtcConvertLocalTimeToUtc: 0x0A05E201
+          sceRtcConvertUtcToLocalTime: 0x1282C436
+          sceRtcFormatRFC2822: 0x147F2138
+          sceRtcFormatRFC2822LocalTime: 0x42CA8EB5
+          sceRtcFormatRFC3339: 0xCCEA2B54
+          sceRtcFormatRFC3339LocalTime: 0x742250A9
+          sceRtcGetCurrentClock: 0x70FDE8F1
+          sceRtcGetCurrentClockLocalTime: 0x0572EDDC
+          sceRtcGetCurrentNetworkTick: 0xCDDD25FE
+          sceRtcGetCurrentTick: 0x23F79274
+          sceRtcGetDayOfWeek: 0x2F3531EB
+          sceRtcGetDayOfYear: 0xB5C4E95F
+          sceRtcGetDaysInMonth: 0x49EB4556
+          sceRtcGetDosTime: 0x92ABEBAF
+          sceRtcGetLastAdjustedTick: 0x8148E95C
+          sceRtcGetLastReincarnatedTick: 0xA8C16615
+          sceRtcGetTick: 0xF2B238E2
+          sceRtcGetTickResolution: 0x811313B3
+          sceRtcGetTime64_t: 0xC995DE02
+          sceRtcGetTime_t: 0x8DE6FEB7
+          sceRtcGetWin32FileTime: 0x8A95E119
+          sceRtcIsLeapYear: 0xF17FD8B5
+          sceRtcParseDateTime: 0x2347CE12
+          sceRtcParseRFC3339: 0x2D18AEEC
+          sceRtcSetDosTime: 0xF8B22B07
+          sceRtcSetTick: 0xCD89F464
+          sceRtcSetTime64_t: 0xA6C36B6A
+          sceRtcSetTime_t: 0x3A332F81
+          sceRtcSetWin32FileTime: 0xA79A8846
+          sceRtcTickAddDays: 0x58DE3C70
+          sceRtcTickAddHours: 0x6F193F55
+          sceRtcTickAddMicroseconds: 0xAE26D920
+          sceRtcTickAddMinutes: 0x4C358871
+          sceRtcTickAddMonths: 0x6321B4AA
+          sceRtcTickAddSeconds: 0x979AFD79
+          sceRtcTickAddTicks: 0x4559E2DB
+          sceRtcTickAddWeeks: 0xE713C640
+          sceRtcTickAddYears: 0xDF6C3E1B
diff --git a/nids/360/SceRtcUser.yml b/nids/360/SceRtcUser.yml
deleted file mode 100644
index fd7bebe..0000000
--- a/nids/360/SceRtcUser.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-modules:
-  SceRtcUser:
-    nid: 0x000000A9
-    libraries:
-      SceRtcUser:
-        nid: 0x000000AA
-        functions:
-          sceRtcCheckValid: 0xD7622935
-          sceRtcCompareTick: 0xC7385158
-          sceRtcConvertLocalTimeToUtc: 0x0A05E201
-          sceRtcConvertUtcToLocalTime: 0x1282C436
-          sceRtcFormatRFC2822: 0x147F2138
-          sceRtcFormatRFC2822LocalTime: 0x42CA8EB5
-          sceRtcFormatRFC3339: 0xCCEA2B54
-          sceRtcFormatRFC3339LocalTime: 0x742250A9
-          sceRtcGetCurrentClock: 0x70FDE8F1
-          sceRtcGetCurrentClockLocalTime: 0x0572EDDC
-          sceRtcGetCurrentNetworkTick: 0xCDDD25FE
-          sceRtcGetCurrentTick: 0x23F79274
-          sceRtcGetDayOfWeek: 0x2F3531EB
-          sceRtcGetDayOfYear: 0xB5C4E95F
-          sceRtcGetDaysInMonth: 0x49EB4556
-          sceRtcGetDosTime: 0x92ABEBAF
-          sceRtcGetLastAdjustedTick: 0x8148E95C
-          sceRtcGetLastReincarnatedTick: 0xA8C16615
-          sceRtcGetTick: 0xF2B238E2
-          sceRtcGetTickResolution: 0x811313B3
-          sceRtcGetTime64_t: 0xC995DE02
-          sceRtcGetTime_t: 0x8DE6FEB7
-          sceRtcGetWin32FileTime: 0x8A95E119
-          sceRtcIsLeapYear: 0xF17FD8B5
-          sceRtcParseDateTime: 0x2347CE12
-          sceRtcParseRFC3339: 0x2D18AEEC
-          sceRtcSetDosTime: 0xF8B22B07
-          sceRtcSetTick: 0xCD89F464
-          sceRtcSetTime64_t: 0xA6C36B6A
-          sceRtcSetTime_t: 0x3A332F81
-          sceRtcSetWin32FileTime: 0xA79A8846
-          sceRtcTickAddDays: 0x58DE3C70
-          sceRtcTickAddHours: 0x6F193F55
-          sceRtcTickAddMicroseconds: 0xAE26D920
-          sceRtcTickAddMinutes: 0x4C358871
-          sceRtcTickAddMonths: 0x6321B4AA
-          sceRtcTickAddSeconds: 0x979AFD79
-          sceRtcTickAddTicks: 0x4559E2DB
-          sceRtcTickAddWeeks: 0xE713C640
-          sceRtcTickAddYears: 0xDF6C3E1B
diff --git a/nids/360/SceSysmem.yml b/nids/360/SceSysmem.yml
deleted file mode 100644
index 16d3207..0000000
--- a/nids/360/SceSysmem.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-modules:
-  SceSysmem:
-    nid: 0x000000DB
-    libraries:
-      SceSysmem:
-        nid: 0x000000DC
-        functions:
-          sceKernelAllocMemBlock: 0xB9D5EBDE
-          sceKernelFindMemBlockByAddr: 0xA33B99D1
-          sceKernelFreeMemBlock: 0xA91E15EE
-          sceKernelGetFreeMemorySize: 0x87CC580B
-          sceKernelGetMemBlockBase: 0xB8EF5818
-          sceKernelGetMemBlockInfoByAddr: 0x4010AD65
-          sceKernelGetMemBlockInfoByRange: 0x006F3DB4
diff --git a/nids/360/SceThreadmgr.yml b/nids/360/SceThreadmgr.yml
deleted file mode 100644
index 0530cad..0000000
--- a/nids/360/SceThreadmgr.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-modules:
-  SceThreadmgr:
-    nid: 0x000000E1
-    libraries:
-      SceThreadmgr:
-        nid: 0x000000E2
-        functions:
-          sceKernelCancelCallback: 0x30741EF2
-          sceKernelChangeActiveCpuMask: 0x001173F8
-          sceKernelChangeThreadCpuAffinityMask: 0x15129174
-          sceKernelChangeThreadPriority: 0xBD0139F2
-          sceKernelChangeThreadVfpException: 0xCC18FBAE
-          sceKernelCheckCallback: 0xE53E41F6
-          sceKernelCheckWaitableStatus: 0xD9BD74EB
-          sceKernelClearEvent: 0x7B2A4B28
-          sceKernelClearEventFlag: 0x4CB87CA7
-          sceKernelCloseCond: 0x15C690E0
-          sceKernelCloseEventFlag: 0x9A68F547
-          sceKernelCloseMsgPipe: 0x1305A065
-          sceKernelCloseMutex: 0x03E23AF6
-          sceKernelCloseRWLock: 0xFD5BD5C1
-          sceKernelCloseSema: 0xA2D81F9E
-          sceKernelCloseSimpleEvent: 0xFEF4CA53
-          sceKernelCloseTimer: 0xACE60E4A
-          sceKernelCreateCallback: 0xB19CF7E9
-          sceKernelCreateThreadForUser: 0xC0FAF6A3
-          sceKernelDelayThread: 0x4B675D05
-          sceKernelDelayThreadCB: 0x9C0180E1
-          sceKernelDeleteCallback: 0xD469676B
-          sceKernelDeleteCond: 0x879E6EBD
-          sceKernelDeleteEventFlag: 0x5840162C
-          sceKernelDeleteMsgPipe: 0xE78BCCF7
-          sceKernelDeleteMutex: 0xCB78710D
-          sceKernelDeleteRWLock: 0xE73649CA
-          sceKernelDeleteSema: 0xDB32948A
-          sceKernelDeleteSimpleEvent: 0x208CFE28
-          sceKernelDeleteThread: 0x1BBDE3D9
-          sceKernelDeleteTimer: 0xAB1E42C4
-          sceKernelExitDeleteThread: 0x1D17DECF
-          sceKernelGetCallbackCount: 0x038644D5
-          sceKernelGetProcessId: 0x9DCB4B7A
-          sceKernelGetThreadStackFreeSize: 0x4F8A3DA0
-          sceKernelGetThreadmgrUIDClass: 0xC9678F7F
-          sceKernelGetTimerBaseWide: 0x5DBC1960
-          sceKernelGetTimerTimeWide: 0x3EFD3165
-          sceKernelNotifyCallback: 0xA4683592
-          sceKernelOpenCond: 0x76BDA02F
-          sceKernelOpenEventFlag: 0xBC19F8A1
-          sceKernelOpenMsgPipe: 0x0E1CB9F6
-          sceKernelOpenMutex: 0x52E17182
-          sceKernelOpenRWLock: 0xCE510196
-          sceKernelOpenSema: 0xCBE235C7
-          sceKernelOpenSimpleEvent: 0x4E1E4DF8
-          sceKernelOpenTimer: 0xB6E286E7
-          sceKernelPollSema: 0x866EF048
-          sceKernelPulseEvent: 0x8D27BAD6
-          sceKernelRegisterCallbackToEvent: 0x76FB37E9
-          sceKernelSendSignal: 0xD4C367B2
-          sceKernelSetEvent: 0x324218CD
-          sceKernelSetEventFlag: 0xEC94DFF7
-          sceKernelSetTimerTimeWide: 0x273B4A4D
-          sceKernelSignalCond: 0x6ED2E2DC
-          sceKernelSignalCondAll: 0xC2E7AC22
-          sceKernelSignalCondTo: 0x1269F4EC
-          sceKernelSignalSema: 0xE6B761D1
-          sceKernelStartTimer: 0x48091E0C
-          sceKernelStopTimer: 0x869E9F20
-          sceKernelTryLockMutex: 0x72FC1F54
-          sceKernelTryLockReadRWLock: 0xEFDDA456
-          sceKernelTryLockWriteRWLock: 0x206CBB66
-          sceKernelUnlockMutex: 0x1A372EC8
-          sceKernelUnlockReadRWLock: 0x3EF91145
-          sceKernelUnlockWriteRWLock: 0xB4151397
-          sceKernelUnregisterCallbackFromEvent: 0x18462B11
-          sceKernelUnregisterCallbackFromEventAll: 0x888A7361
diff --git a/nids/360/SceThreadmgrCoredumpTime.yml b/nids/360/SceThreadmgrCoredumpTime.yml
deleted file mode 100644
index fdb671d..0000000
--- a/nids/360/SceThreadmgrCoredumpTime.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-modules:
-  SceThreadmgrCoredumpTime:
-    nid: 0x000000E3
-    libraries:
-      SceThreadmgrCoredumpTime:
-        nid: 0x000000E4
-        functions:
-          sceKernelExitThread: 0x0C8A38E1
diff --git a/nids/360/SceVideodecUser.yml b/nids/360/SceVideodec.yml
index 8ad52f2..2e0a901 100644
--- a/nids/360/SceVideodecUser.yml
+++ b/nids/360/SceVideodec.yml
@@ -1,5 +1,5 @@
 modules:
-  SceVideodecUser:
+  SceVideodec:
     nid: 0x000000E9
     libraries:
       SceVideodecUser: