diff --git a/source/gamecard.c b/source/gamecard.c
index 6927f2b..58aab9d 100644
--- a/source/gamecard.c
+++ b/source/gamecard.c
@@ -201,10 +201,10 @@ bool gamecardInitialize(void)
     
     g_loadKernelEvent = true;
     
-    /* Create usermode exit event. */
+    /* Create user-mode exit event. */
     ueventCreate(&g_gameCardDetectionThreadExitEvent, true);
     
-    /* Create usermode gamecard status change event. */
+    /* Create user-mode gamecard status change event. */
     ueventCreate(&g_gameCardStatusChangeEvent, true);
     
     /* Create gamecard detection thread. */
diff --git a/source/gamecard.h b/source/gamecard.h
index 45e1d2f..a30bbc5 100644
--- a/source/gamecard.h
+++ b/source/gamecard.h
@@ -187,7 +187,7 @@ bool gamecardInitialize(void);
 /// This includes destroying the background gamecard detection thread and freeing all cached gamecard data.
 void gamecardExit(void);
 
-/// Returns a usermode gamecard status change event that can be used to wait for status changes on other threads.
+/// Returns a user-mode gamecard status change event that can be used to wait for status changes on other threads.
 /// If the gamecard interface hasn't been initialized, this returns NULL.
 UEvent *gamecardGetStatusChangeUserEvent(void);
 
diff --git a/source/title.c b/source/title.c
index 731efe9..c7a4e62 100644
--- a/source/title.c
+++ b/source/title.c
@@ -467,7 +467,7 @@ bool titleInitialize(void)
         goto end;
     }
     
-    /* Create usermode exit event. */
+    /* Create user-mode exit event. */
     ueventCreate(&g_titleGameCardInfoThreadExitEvent, true);
     
     /* Retrieve gamecard status change user event. */
@@ -478,7 +478,7 @@ bool titleInitialize(void)
         goto end;
     }
     
-    /* Create usermode gamecard update info event. */
+    /* Create user-mode gamecard update info event. */
     ueventCreate(&g_titleGameCardUpdateInfoUserEvent, true);
     
     /* Create gamecard title info thread. */
diff --git a/source/usb.c b/source/usb.c
index b717376..0ff15a4 100644
--- a/source/usb.c
+++ b/source/usb.c
@@ -181,10 +181,10 @@ bool usbInitialize(void)
         goto end;
     }
     
-    /* Create usermode exit event. */
+    /* Create user-mode exit event. */
     ueventCreate(&g_usbDetectionThreadExitEvent, true);
     
-    /* Create usermode USB timeout event. */
+    /* Create user-mode USB timeout event. */
     ueventCreate(&g_usbTimeoutEvent, true);
     
     /* Create USB detection thread. */
@@ -455,7 +455,7 @@ void usbCancelFileTransfer(void)
     /* This will force the client to stop the current session, so a new one will have to be established. */
     usbDsEndpoint_Stall(g_usbDeviceInterface.endpoint_in);
     
-    /* Signal usermode USB timeout event. */
+    /* Signal user-mode USB timeout event. */
     /* This will "reset" the USB connection by making the background thread wait until a new session is established. */
     ueventSignal(&g_usbTimeoutEvent);
     
@@ -1222,7 +1222,7 @@ static bool usbTransferData(void *buf, u64 size, UsbDsEndpoint *endpoint)
         eventWait(&(endpoint->CompletionEvent), UINT64_MAX);
         eventClear(&(endpoint->CompletionEvent));
         
-        /* Signal usermode USB timeout event if needed. */
+        /* Signal user-mode USB timeout event if needed. */
         /* This will "reset" the USB connection by making the background thread wait until a new session is established. */
         if (g_usbSessionStarted) ueventSignal(&g_usbTimeoutEvent);