diff --git a/src/common/key_map.h b/src/common/key_map.h
index d2e6851a7..b5acfbab0 100644
--- a/src/common/key_map.h
+++ b/src/common/key_map.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "hid_u.h"
+#include "core/hle/service/hid.h"
 
 namespace KeyMap {
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 947ccd788..aefbe3375 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -30,11 +30,11 @@ set(SRCS
             hle/kernel/mutex.cpp
             hle/kernel/shared_memory.cpp
             hle/kernel/thread.cpp
-            hle/service/apt_u.cpp
-            hle/service/fs_user.cpp
-            hle/service/gsp_gpu.cpp
-            hle/service/hid_user.cpp
-            hle/service/ndm_u.cpp
+            hle/service/apt.cpp
+            hle/service/fs.cpp
+            hle/service/gsp.cpp
+            hle/service/hid.cpp
+            hle/service/ndm.cpp
             hle/service/service.cpp
             hle/service/srv.cpp
             hle/config_mem.cpp
@@ -91,11 +91,11 @@ set(HEADERS
             hle/kernel/mutex.h
             hle/kernel/shared_memory.h
             hle/kernel/thread.h
-            hle/service/apt_u.h
-            hle/service/fs_user.h
-            hle/service/gsp_gpu.h
-            hle/service/hid_user.h
-            hle/service/ndm_u.h
+            hle/service/apt.h
+            hle/service/fs.h
+            hle/service/gsp.h
+            hle/service/hid.h
+            hle/service/ndm.h
             hle/service/service.h
             hle/service/srv.h
             hle/config_mem.h
diff --git a/src/core/hle/service/apt_u.cpp b/src/core/hle/service/apt.cpp
similarity index 99%
rename from src/core/hle/service/apt_u.cpp
rename to src/core/hle/service/apt.cpp
index 617b6add4..3753f1107 100644
--- a/src/core/hle/service/apt_u.cpp
+++ b/src/core/hle/service/apt.cpp
@@ -8,7 +8,7 @@
 #include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/mutex.h"
-#include "apt_u.h"
+#include "core/hle/service/apt.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace APT_U
diff --git a/src/core/hle/service/apt_u.h b/src/core/hle/service/apt.h
similarity index 100%
rename from src/core/hle/service/apt_u.h
rename to src/core/hle/service/apt.h
diff --git a/src/core/hle/service/fs_user.cpp b/src/core/hle/service/fs.cpp
similarity index 99%
rename from src/core/hle/service/fs_user.cpp
rename to src/core/hle/service/fs.cpp
index 012174321..662c4f247 100644
--- a/src/core/hle/service/fs_user.cpp
+++ b/src/core/hle/service/fs.cpp
@@ -4,7 +4,7 @@
 
 #include "common/common.h"
 
-#include "fs_user.h"
+#include "core/hle/service/fs.h"
 #include "core/hle/kernel/archive.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/fs_user.h b/src/core/hle/service/fs.h
similarity index 100%
rename from src/core/hle/service/fs_user.h
rename to src/core/hle/service/fs.h
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp.cpp
similarity index 99%
rename from src/core/hle/service/gsp_gpu.cpp
rename to src/core/hle/service/gsp.cpp
index 6119e6300..614d9584d 100644
--- a/src/core/hle/service/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp.cpp
@@ -9,7 +9,7 @@
 #include "core/mem_map.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
-#include "gsp_gpu.h"
+#include "core/hle/service/gsp.h"
 #include "core/hw/gpu.h"
 
 #include "video_core/gpu_debugger.h"
diff --git a/src/core/hle/service/gsp_gpu.h b/src/core/hle/service/gsp.h
similarity index 100%
rename from src/core/hle/service/gsp_gpu.h
rename to src/core/hle/service/gsp.h
diff --git a/src/core/hle/service/hid_user.cpp b/src/core/hle/service/hid.cpp
similarity index 99%
rename from src/core/hle/service/hid_user.cpp
rename to src/core/hle/service/hid.cpp
index 0eb32ba4a..ef38a5603 100644
--- a/src/core/hle/service/hid_user.cpp
+++ b/src/core/hle/service/hid.cpp
@@ -7,7 +7,7 @@
 #include "core/hle/hle.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
-#include "hid_user.h"
+#include "core/hle/service/hid.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace HID_User
diff --git a/src/core/hle/service/hid_user.h b/src/core/hle/service/hid.h
similarity index 100%
rename from src/core/hle/service/hid_user.h
rename to src/core/hle/service/hid.h
diff --git a/src/core/hle/service/ndm_u.cpp b/src/core/hle/service/ndm.cpp
similarity index 95%
rename from src/core/hle/service/ndm_u.cpp
rename to src/core/hle/service/ndm.cpp
index 37c0661bf..f6af0a153 100644
--- a/src/core/hle/service/ndm_u.cpp
+++ b/src/core/hle/service/ndm.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "core/hle/hle.h"
-#include "ndm_u.h"
+#include "core/hle/service/ndm.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Namespace NDM_U
diff --git a/src/core/hle/service/ndm_u.h b/src/core/hle/service/ndm.h
similarity index 100%
rename from src/core/hle/service/ndm_u.h
rename to src/core/hle/service/ndm.h
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 28458e14c..9eb1726aa 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -6,11 +6,11 @@
 #include "common/string_util.h"
 
 #include "core/hle/service/service.h"
-#include "apt_u.h"
-#include "fs_user.h"
-#include "gsp_gpu.h"
-#include "hid_user.h"
-#include "ndm_u.h"
+#include "core/hle/service/apt.h"
+#include "core/hle/service/fs.h"
+#include "core/hle/service/gsp.h"
+#include "core/hle/service/hid.h"
+#include "core/hle/service/ndm.h"
 #include "core/hle/service/srv.h"
 
 namespace Service {
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 9f1f1dc47..76dbe3fdc 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -9,7 +9,7 @@
 #include "core/mem_map.h"
 
 #include "core/hle/hle.h"
-#include "gsp_gpu.h"
+#include "core/hle/service/gsp.h"
 
 #include "core/hw/gpu.h"
 
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h
index e6a675d84..5a81fcfcb 100644
--- a/src/video_core/gpu_debugger.h
+++ b/src/video_core/gpu_debugger.h
@@ -10,7 +10,7 @@
 
 #include "common/log.h"
 
-#include "gsp_gpu.h"
+#include "core/hle/service/gsp.h"
 
 #include "command_processor.h"
 #include "pica.h"