diff --git a/source/core/title.c b/source/core/title.c
index ee191dd..8ea6c2c 100644
--- a/source/core/title.c
+++ b/source/core/title.c
@@ -340,11 +340,43 @@ static const TitleSystemEntry g_systemTitles[] = {
     { 0x1000000000000004, "CalWriter" },
     { 0x1000000000000005, "DevMenuCommand" },
     { 0x1000000000000006, "SettingsManager" },
-    { 0x1000000000000007, "ApplicationLauncer" },
+    { 0x1000000000000007, "ApplicationLauncer" },   ///< Also DevMenu?
     { 0x100000000000000B, "SnapShotDumper" },
     { 0x100000000000000C, "SystemUpdater" },
     { 0x100000000000000E, "ControllerFirmwareUpdater" },
     
+    /* Prototype titles. */
+    { 0x1000000000000201, "usb" },
+    { 0x1000000000000202, "tma" },
+    { 0x1000000000000203, "boot2" },
+    { 0x1000000000000204, "settings" },
+    { 0x1000000000000205, "bus" },
+    { 0x1000000000000206, "bluetooth" },
+    { 0x1000000000000208, "DebugMonitor0" },
+    { 0x1000000000000209, "dmnt" },
+    { 0x100000000000020B, "nifm" },
+    { 0x100000000000020C, "ptm" },
+    { 0x100000000000020D, "shell" },
+    { 0x100000000000020E, "bsdsockets" },
+    { 0x100000000000020F, "hid" },
+    { 0x1000000000000210, "audio" },
+    { 0x1000000000000212, "LogManager" },
+    { 0x1000000000000213, "wlan" },
+    { 0x1000000000000214, "cs" },
+    { 0x1000000000000215, "ldn" },
+    { 0x1000000000000216, "nvservices" },
+    { 0x1000000000000217, "pcv" },
+    { 0x1000000000000218, "ppc" },
+    { 0x100000000000021A, "lbl0" },
+    { 0x100000000000021B, "nvnflinger" },
+    { 0x100000000000021C, "pcie" },
+    { 0x100000000000021D, "account" },
+    { 0x100000000000021E, "ns" },
+    { 0x100000000000021F, "nfc" },
+    { 0x1000000000000220, "psc" },
+    { 0x1000000000000221, "capsrv" },
+    { 0x1000000000000222, "am" },
+    
     /* Factory system modules. */
     { 0x010000000000B120, "nvdbgsvc" },
     { 0x010000000000B14A, "manu" },
@@ -354,7 +386,7 @@ static const TitleSystemEntry g_systemTitles[] = {
     { 0x010000000000B1BA, "ProdFwdbgPackage" },
     { 0x010000000000B22A, "scs" },
     { 0x010000000000B22B, "ControllerFirmwareDebug" },
-    { 0x010000000000B240, "htc.stub" },
+    { 0x010000000000B240, "htc" },
     { 0x010000000000C600, "BdkSample01" },
     { 0x010000000000C601, "BdkSample02" },
     { 0x010000000000C602, "BdkSample03" },