diff --git a/app_controldata/source/main.c b/app_controldata/source/main.c
index ad1b90b..a5f82c9 100644
--- a/app_controldata/source/main.c
+++ b/app_controldata/source/main.c
@@ -4,15 +4,15 @@
 
 #include <switch.h>
 
-//This example shows how to get NsApplicationControlData for a title, which contains nacp/icon. See libnx ns.h.
+//This example shows how to get NsApplicationControlData for an application, which contains nacp/icon. See libnx ns.h.
 
 int main(int argc, char **argv)
 {
     Result rc=0;
 
-    u64 titleID=0x01007ef00011e000;//titleID for use with nsGetApplicationControlData, in this case BOTW.
+    u64 application_id=0x01007ef00011e000;//ApplicationId for use with nsGetApplicationControlData, in this case BOTW.
     NsApplicationControlData *buf=NULL;
-    size_t outsize=0;
+    u64 outsize=0;
 
     NacpLanguageEntry *langentry = NULL;
     char name[0x201];
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
     }
 
     if (R_SUCCEEDED(rc)) {
-        rc = nsGetApplicationControlData(1, titleID, buf, sizeof(NsApplicationControlData), &outsize);
+        rc = nsGetApplicationControlData(NsApplicationControlSource_Storage, application_id, buf, sizeof(NsApplicationControlData), &outsize);
         if (R_FAILED(rc)) {
             printf("nsGetApplicationControlData() failed: 0x%x\n", rc);
         }
diff --git a/applet/app-playstats/source/main.c b/applet/app-playstats/source/main.c
index d3eee50..02e9881 100644
--- a/applet/app-playstats/source/main.c
+++ b/applet/app-playstats/source/main.c
@@ -25,7 +25,7 @@ int main(int argc, char* argv[])
     Result rc=0;
     PdmApplicationPlayStatistics stats[1];
     PdmAppletEvent events[1];
-    u64 titleIDs[1] = {0x010021B002EEA000}; // Change this to the titleID of the current-process / the titleID you want to use.
+    u64 application_ids[1] = {0x010021B002EEA000}; // Change this to the ApplicationId of the current-process / the ApplicationId you want to use.
     s32 total_out;
     s32 i;
     bool initflag=0;
@@ -70,16 +70,16 @@ int main(int argc, char* argv[])
             total_out = 0;
 
             if (R_SUCCEEDED(rc)) {
-                rc = appletQueryApplicationPlayStatistics(stats, titleIDs, sizeof(titleIDs)/sizeof(u64), &total_out);
+                rc = appletQueryApplicationPlayStatistics(stats, application_ids, sizeof(application_ids)/sizeof(u64), &total_out);
                 printf("appletQueryApplicationPlayStatistics(): 0x%x\n", rc);
-                //rc = appletQueryApplicationPlayStatisticsByUid(preselected_uid, stats, titleIDs, sizeof(titleIDs)/sizeof(u64), &total_out);
+                //rc = appletQueryApplicationPlayStatisticsByUid(preselected_uid, stats, application_ids, sizeof(application_ids)/sizeof(u64), &total_out);
                 //printf("appletQueryApplicationPlayStatisticsByUid(): 0x%x\n", rc);
             }
             if (R_SUCCEEDED(rc)) {
                 printf("total_out: %d\n", total_out);
                 for (i=0; i<total_out; i++) {
                     printf("%d: ", i);
-                    printf("titleID = 0x%08lX, totalPlayTime = %lu (%llu seconds), totalLaunches = %lu\n", stats[i].titleID, stats[i].totalPlayTime, stats[i].totalPlayTime / 1000000000ULL, stats[i].totalLaunches);
+                    printf("application_id = 0x%08lX, totalPlayTime = %lu (%llu seconds), totalLaunches = %lu\n", stats[i].application_id, stats[i].totalPlayTime, stats[i].totalPlayTime / 1000000000ULL, stats[i].totalLaunches);
                 }
             }
         }
@@ -97,24 +97,24 @@ int main(int argc, char* argv[])
                     time_t tmptime = pdmPlayTimestampToPosix(events[i].timestampUser);
 
                     printf("%d: ", i);
-                    printf("titleID = 0x%08lX, entry_index = 0x%x, timestampUser = %u, timestampNetwork = %u, eventType = %u, timestampUser = %s\n", events[i].titleID, events[i].entry_index, events[i].timestampUser, events[i].timestampNetwork, events[i].eventType, ctime(&tmptime));
+                    printf("program_id = 0x%08lX, entry_index = 0x%x, timestampUser = %u, timestampNetwork = %u, eventType = %u, timestampUser = %s\n", events[i].program_id, events[i].entry_index, events[i].timestampUser, events[i].timestampNetwork, events[i].eventType, ctime(&tmptime));
                 }
             }
 
-            // Get PdmPlayStatistics for the specified title.
+            // Get PdmPlayStatistics for the specified ApplicationId.
             PdmPlayStatistics playstats[1]={0};
-            rc = pdmqryQueryPlayStatisticsByApplicationId(titleIDs[0], &playstats[0]);
+            rc = pdmqryQueryPlayStatisticsByApplicationId(application_ids[0], &playstats[0]);
             printf("pdmqryQueryPlayStatisticsByApplicationId(): 0x%x\n", rc);
-            if (R_SUCCEEDED(rc)) printf("titleID = 0x%08lX, playtimeMinutes = %u, totalLaunches = %u\n", playstats[0].titleID, playstats[0].playtimeMinutes, playstats[0].totalLaunches);
+            if (R_SUCCEEDED(rc)) printf("application_id = 0x%08lX, playtimeMinutes = %u, totalLaunches = %u\n", playstats[0].application_id, playstats[0].playtimeMinutes, playstats[0].totalLaunches);
 
-            // Get PdmPlayStatistics for the specified title and user.
-            rc = pdmqryQueryPlayStatisticsByApplicationIdAndUserAccountId(titleIDs[0], preselected_uid, &playstats[0]);
+            // Get PdmPlayStatistics for the specified ApplicationId and user.
+            rc = pdmqryQueryPlayStatisticsByApplicationIdAndUserAccountId(application_ids[0], preselected_uid, &playstats[0]);
             printf("pdmqryQueryPlayStatisticsByApplicationIdAndUserAccountId(): 0x%x\n", rc);
-            if (R_SUCCEEDED(rc)) printf("titleID = 0x%08lX, playtimeMinutes = %u, totalLaunches = %u\n", playstats[0].titleID, playstats[0].playtimeMinutes, playstats[0].totalLaunches);
+            if (R_SUCCEEDED(rc)) printf("application_id = 0x%08lX, playtimeMinutes = %u, totalLaunches = %u\n", playstats[0].application_id, playstats[0].playtimeMinutes, playstats[0].totalLaunches);
 
-            // Get a listing of PdmLastPlayTime for the specified titles.
+            // Get a listing of PdmLastPlayTime for the specified applications.
             PdmLastPlayTime playtimes[1]={0};
-            rc = pdmqryQueryLastPlayTime(playtimes, titleIDs, 1, &total_out);
+            rc = pdmqryQueryLastPlayTime(playtimes, application_ids, 1, &total_out);
             printf("pdmqryQueryLastPlayTime(): 0x%x, %d\n, ", rc, total_out);
             if (R_SUCCEEDED(rc)) {
                 for (i=0; i<total_out; i++)
@@ -126,12 +126,12 @@ int main(int argc, char* argv[])
             rc = pdmqryGetAvailablePlayEventRange(&total_entries, &start_entryindex, &end_entryindex);
             printf("pdmqryGetAvailablePlayEventRange(): 0x%x, 0x%x, 0x%x, 0x%x\n", rc, total_entries, start_entryindex, end_entryindex);
 
-            // Get a listing of titles recently played by the specified user.
-            rc = pdmqryQueryRecentlyPlayedApplication(preselected_uid, titleIDs, 1, &total_out);
+            // Get a listing of applications recently played by the specified user.
+            rc = pdmqryQueryRecentlyPlayedApplication(preselected_uid, application_ids, 1, &total_out);
             printf("pdmqryQueryRecentlyPlayedApplication(): 0x%x, %d\n", rc, total_out);
             if (R_SUCCEEDED(rc)) {
                 for (i=0; i<total_out; i++)
-                    printf("%d: titleID = 0x%08lX\n", i, titleIDs[i]);
+                    printf("%d: application_id = 0x%08lX\n", i, application_ids[i]);
             }
 
             // For more cmds, see pdm.h.
diff --git a/applet/libapplets/web/source/main.c b/applet/libapplets/web/source/main.c
index 2f1458c..9212c43 100644
--- a/applet/libapplets/web/source/main.c
+++ b/applet/libapplets/web/source/main.c
@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
             WebExitReason exitReason=0;
 
             // Create the config. There's a number of web*Create() funcs, see libnx web.h.
-            // webPageCreate/webNewsCreate requires running under a host title which has HtmlDocument content, when the title is an Application. When the title is an Application when using webPageCreate/webNewsCreate, and webConfigSetWhitelist is not used, the whitelist will be loaded from the content. Atmosphère hbl_html can be used to handle this.
+            // webPageCreate/webNewsCreate requires running under a host Application which has HtmlDocument content. When the host program is an Application when using webPageCreate/webNewsCreate, and webConfigSetWhitelist is not used, the whitelist will be loaded from the content. Atmosphère hbl_html can be used to handle this.
             rc = webPageCreate(&config, "https://google.com/");
             printf("webPageCreate(): 0x%x\n", rc);
 
diff --git a/applet/vrmode/source/main.c b/applet/vrmode/source/main.c
index fce86dc..1906726 100644
--- a/applet/vrmode/source/main.c
+++ b/applet/vrmode/source/main.c
@@ -9,7 +9,7 @@
 // This example shows how to use VrMode, see also libnx applet.h and pctl.h.
 // TODO: This needs replaced with GL rendering, to handle the special VrMode rendering.
 
-// When running on pre-7.0.0, hbl has to run under the labo-vr application for the host title.
+// When running on pre-7.0.0, hbl has to run under the labo-vr application for the host application.
 
 // Main program entrypoint
 int main(int argc, char* argv[])