From c6d7da88c7ab125279ea4ccad0e3e839632b2f7a Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Wed, 14 Jul 2021 00:52:17 -0400
Subject: [PATCH] service: Append service name prefix to common filenames
---
src/core/CMakeLists.txt | 44 +++++++++----------
src/core/core.cpp | 4 +-
src/core/hardware_interrupt_manager.cpp | 2 +-
src/core/hle/service/acc/acc.cpp | 2 +-
src/core/hle/service/acc/acc.h | 2 +-
src/core/hle/service/am/am.cpp | 4 +-
src/core/hle/service/apm/apm.cpp | 2 +-
.../{controller.cpp => apm_controller.cpp} | 2 +-
.../apm/{controller.h => apm_controller.h} | 0
.../apm/{interface.cpp => apm_interface.cpp} | 4 +-
.../apm/{interface.h => apm_interface.h} | 0
src/core/hle/service/bcat/bcat.h | 2 +-
.../bcat/{module.cpp => bcat_module.cpp} | 2 +-
.../service/bcat/{module.h => bcat_module.h} | 0
src/core/hle/service/friend/friend.cpp | 2 +-
.../{interface.cpp => friend_interface.cpp} | 2 +-
.../{interface.h => friend_interface.h} | 0
src/core/hle/service/glue/arp.cpp | 2 +-
.../glue/{manager.cpp => glue_manager.cpp} | 2 +-
.../glue/{manager.h => glue_manager.h} | 0
src/core/hle/service/mii/mii.cpp | 2 +-
.../mii/{manager.cpp => mii_manager.cpp} | 2 +-
.../service/mii/{manager.h => mii_manager.h} | 0
src/core/hle/service/mii/raw_data.h | 2 +-
src/core/hle/service/nvdrv/nvdrv.cpp | 2 +-
.../{interface.cpp => nvdrv_interface.cpp} | 2 +-
.../nvdrv/{interface.h => nvdrv_interface.h} | 0
src/core/hle/service/pctl/pctl.h | 2 +-
.../pctl/{module.cpp => pctl_module.cpp} | 2 +-
.../service/pctl/{module.h => pctl_module.h} | 0
src/core/hle/service/service.cpp | 6 +--
src/core/hle/service/sm/sm.cpp | 2 +-
.../sm/{controller.cpp => sm_controller.cpp} | 2 +-
.../sm/{controller.h => sm_controller.h} | 0
src/core/hle/service/spl/csrng.h | 2 +-
src/core/hle/service/spl/spl.h | 2 +-
.../spl/{module.cpp => spl_module.cpp} | 2 +-
.../service/spl/{module.h => spl_module.h} | 0
src/core/hle/service/time/time.cpp | 2 +-
.../{interface.cpp => time_interface.cpp} | 2 +-
.../time/{interface.h => time_interface.h} | 0
41 files changed, 56 insertions(+), 56 deletions(-)
rename src/core/hle/service/apm/{controller.cpp => apm_controller.cpp} (98%)
rename src/core/hle/service/apm/{controller.h => apm_controller.h} (100%)
rename src/core/hle/service/apm/{interface.cpp => apm_interface.cpp} (97%)
rename src/core/hle/service/apm/{interface.h => apm_interface.h} (100%)
rename src/core/hle/service/bcat/{module.cpp => bcat_module.cpp} (99%)
rename src/core/hle/service/bcat/{module.h => bcat_module.h} (100%)
rename src/core/hle/service/friend/{interface.cpp => friend_interface.cpp} (92%)
rename src/core/hle/service/friend/{interface.h => friend_interface.h} (100%)
rename src/core/hle/service/glue/{manager.cpp => glue_manager.cpp} (97%)
rename src/core/hle/service/glue/{manager.h => glue_manager.h} (100%)
rename src/core/hle/service/mii/{manager.cpp => mii_manager.cpp} (99%)
rename src/core/hle/service/mii/{manager.h => mii_manager.h} (100%)
rename src/core/hle/service/nvdrv/{interface.cpp => nvdrv_interface.cpp} (99%)
rename src/core/hle/service/nvdrv/{interface.h => nvdrv_interface.h} (100%)
rename src/core/hle/service/pctl/{module.cpp => pctl_module.cpp} (99%)
rename src/core/hle/service/pctl/{module.h => pctl_module.h} (100%)
rename src/core/hle/service/sm/{controller.cpp => sm_controller.cpp} (98%)
rename src/core/hle/service/sm/{controller.h => sm_controller.h} (100%)
rename src/core/hle/service/spl/{module.cpp => spl_module.cpp} (99%)
rename src/core/hle/service/spl/{module.h => spl_module.h} (100%)
rename src/core/hle/service/time/{interface.cpp => time_interface.cpp} (97%)
rename src/core/hle/service/time/{interface.h => time_interface.h} (100%)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 48b16f8f76..c7b8991315 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -300,10 +300,10 @@ add_library(core STATIC
hle/service/aoc/aoc_u.h
hle/service/apm/apm.cpp
hle/service/apm/apm.h
- hle/service/apm/controller.cpp
- hle/service/apm/controller.h
- hle/service/apm/interface.cpp
- hle/service/apm/interface.h
+ hle/service/apm/apm_controller.cpp
+ hle/service/apm/apm_controller.h
+ hle/service/apm/apm_interface.cpp
+ hle/service/apm/apm_interface.h
hle/service/audio/audctl.cpp
hle/service/audio/audctl.h
hle/service/audio/auddbg.cpp
@@ -335,8 +335,8 @@ add_library(core STATIC
hle/service/bcat/backend/backend.h
hle/service/bcat/bcat.cpp
hle/service/bcat/bcat.h
- hle/service/bcat/module.cpp
- hle/service/bcat/module.h
+ hle/service/bcat/bcat_module.cpp
+ hle/service/bcat/bcat_module.h
hle/service/bpc/bpc.cpp
hle/service/bpc/bpc.h
hle/service/btdrv/btdrv.cpp
@@ -382,8 +382,8 @@ add_library(core STATIC
hle/service/friend/errors.h
hle/service/friend/friend.cpp
hle/service/friend/friend.h
- hle/service/friend/interface.cpp
- hle/service/friend/interface.h
+ hle/service/friend/friend_interface.cpp
+ hle/service/friend/friend_interface.h
hle/service/glue/arp.cpp
hle/service/glue/arp.h
hle/service/glue/bgtc.cpp
@@ -393,8 +393,8 @@ add_library(core STATIC
hle/service/glue/errors.h
hle/service/glue/glue.cpp
hle/service/glue/glue.h
- hle/service/glue/manager.cpp
- hle/service/glue/manager.h
+ hle/service/glue/glue_manager.cpp
+ hle/service/glue/glue_manager.h
hle/service/grc/grc.cpp
hle/service/grc/grc.h
hle/service/hid/hid.cpp
@@ -435,10 +435,10 @@ add_library(core STATIC
hle/service/lm/lm.h
hle/service/mig/mig.cpp
hle/service/mig/mig.h
- hle/service/mii/manager.cpp
- hle/service/mii/manager.h
hle/service/mii/mii.cpp
hle/service/mii/mii.h
+ hle/service/mii/mii_manager.cpp
+ hle/service/mii/mii_manager.h
hle/service/mii/raw_data.cpp
hle/service/mii/raw_data.h
hle/service/mii/types.h
@@ -486,11 +486,11 @@ add_library(core STATIC
hle/service/nvdrv/devices/nvhost_vic.h
hle/service/nvdrv/devices/nvmap.cpp
hle/service/nvdrv/devices/nvmap.h
- hle/service/nvdrv/interface.cpp
- hle/service/nvdrv/interface.h
hle/service/nvdrv/nvdata.h
hle/service/nvdrv/nvdrv.cpp
hle/service/nvdrv/nvdrv.h
+ hle/service/nvdrv/nvdrv_interface.cpp
+ hle/service/nvdrv/nvdrv_interface.h
hle/service/nvdrv/nvmemp.cpp
hle/service/nvdrv/nvmemp.h
hle/service/nvdrv/syncpoint_manager.cpp
@@ -503,10 +503,10 @@ add_library(core STATIC
hle/service/olsc/olsc.h
hle/service/pcie/pcie.cpp
hle/service/pcie/pcie.h
- hle/service/pctl/module.cpp
- hle/service/pctl/module.h
hle/service/pctl/pctl.cpp
hle/service/pctl/pctl.h
+ hle/service/pctl/pctl_module.cpp
+ hle/service/pctl/pctl_module.h
hle/service/pcv/pcv.cpp
hle/service/pcv/pcv.h
hle/service/pm/pm.cpp
@@ -529,10 +529,10 @@ add_library(core STATIC
hle/service/set/set_sys.h
hle/service/set/settings.cpp
hle/service/set/settings.h
- hle/service/sm/controller.cpp
- hle/service/sm/controller.h
hle/service/sm/sm.cpp
hle/service/sm/sm.h
+ hle/service/sm/sm_controller.cpp
+ hle/service/sm/sm_controller.h
hle/service/sockets/bsd.cpp
hle/service/sockets/bsd.h
hle/service/sockets/ethc.cpp
@@ -547,10 +547,10 @@ add_library(core STATIC
hle/service/sockets/sockets_translate.h
hle/service/spl/csrng.cpp
hle/service/spl/csrng.h
- hle/service/spl/module.cpp
- hle/service/spl/module.h
hle/service/spl/spl.cpp
hle/service/spl/spl.h
+ hle/service/spl/spl_module.cpp
+ hle/service/spl/spl_module.h
hle/service/spl/spl_results.h
hle/service/spl/spl_types.h
hle/service/ssl/ssl.cpp
@@ -559,8 +559,6 @@ add_library(core STATIC
hle/service/time/ephemeral_network_system_clock_context_writer.h
hle/service/time/ephemeral_network_system_clock_core.h
hle/service/time/errors.h
- hle/service/time/interface.cpp
- hle/service/time/interface.h
hle/service/time/local_system_clock_context_writer.h
hle/service/time/network_system_clock_context_writer.h
hle/service/time/standard_local_system_clock_core.h
@@ -578,6 +576,8 @@ add_library(core STATIC
hle/service/time/tick_based_steady_clock_core.h
hle/service/time/time.cpp
hle/service/time/time.h
+ hle/service/time/time_interface.cpp
+ hle/service/time/time_interface.h
hle/service/time/time_manager.cpp
hle/service/time/time_manager.h
hle/service/time/time_sharedmemory.cpp
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 891f1cb491..406320ed6b 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -35,9 +35,9 @@
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/physical_core.h"
#include "core/hle/service/am/applets/applets.h"
-#include "core/hle/service/apm/controller.h"
+#include "core/hle/service/apm/apm_controller.h"
#include "core/hle/service/filesystem/filesystem.h"
-#include "core/hle/service/glue/manager.h"
+#include "core/hle/service/glue/glue_manager.h"
#include "core/hle/service/hid/hid.h"
#include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h"
diff --git a/src/core/hardware_interrupt_manager.cpp b/src/core/hardware_interrupt_manager.cpp
index 645f26e913..290db505ee 100644
--- a/src/core/hardware_interrupt_manager.cpp
+++ b/src/core/hardware_interrupt_manager.cpp
@@ -5,7 +5,7 @@
#include "core/core.h"
#include "core/core_timing.h"
#include "core/hardware_interrupt_manager.h"
-#include "core/hle/service/nvdrv/interface.h"
+#include "core/hle/service/nvdrv/nvdrv_interface.h"
#include "core/hle/service/sm/sm.h"
namespace Core::Hardware {
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp
index d1c1fb71de..2e969f2a8c 100644
--- a/src/core/hle/service/acc/acc.cpp
+++ b/src/core/hle/service/acc/acc.cpp
@@ -26,7 +26,7 @@
#include "core/hle/service/acc/errors.h"
#include "core/hle/service/acc/profile_manager.h"
#include "core/hle/service/glue/arp.h"
-#include "core/hle/service/glue/manager.h"
+#include "core/hle/service/glue/glue_manager.h"
#include "core/hle/service/sm/sm.h"
#include "core/loader/loader.h"
diff --git a/src/core/hle/service/acc/acc.h b/src/core/hle/service/acc/acc.h
index 0e3ad8ec6f..a83a480cd4 100644
--- a/src/core/hle/service/acc/acc.h
+++ b/src/core/hle/service/acc/acc.h
@@ -5,7 +5,7 @@
#pragma once
#include "common/uuid.h"
-#include "core/hle/service/glue/manager.h"
+#include "core/hle/service/glue/glue_manager.h"
#include "core/hle/service/service.h"
namespace Service::Account {
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 41f1e6b686..a538f82e34 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -32,8 +32,8 @@
#include "core/hle/service/am/omm.h"
#include "core/hle/service/am/spsm.h"
#include "core/hle/service/am/tcap.h"
-#include "core/hle/service/apm/controller.h"
-#include "core/hle/service/apm/interface.h"
+#include "core/hle/service/apm/apm_controller.h"
+#include "core/hle/service/apm/apm_interface.h"
#include "core/hle/service/bcat/backend/backend.h"
#include "core/hle/service/filesystem/filesystem.h"
#include "core/hle/service/ns/ns.h"
diff --git a/src/core/hle/service/apm/apm.cpp b/src/core/hle/service/apm/apm.cpp
index 97d6619dd9..f5ebfe8d64 100644
--- a/src/core/hle/service/apm/apm.cpp
+++ b/src/core/hle/service/apm/apm.cpp
@@ -5,7 +5,7 @@
#include "core/core.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/service/apm/apm.h"
-#include "core/hle/service/apm/interface.h"
+#include "core/hle/service/apm/apm_interface.h"
namespace Service::APM {
diff --git a/src/core/hle/service/apm/controller.cpp b/src/core/hle/service/apm/apm_controller.cpp
similarity index 98%
rename from src/core/hle/service/apm/controller.cpp
rename to src/core/hle/service/apm/apm_controller.cpp
index 8bfa7c0e4f..98839fe978 100644
--- a/src/core/hle/service/apm/controller.cpp
+++ b/src/core/hle/service/apm/apm_controller.cpp
@@ -9,7 +9,7 @@
#include "common/logging/log.h"
#include "common/settings.h"
#include "core/core_timing.h"
-#include "core/hle/service/apm/controller.h"
+#include "core/hle/service/apm/apm_controller.h"
namespace Service::APM {
diff --git a/src/core/hle/service/apm/controller.h b/src/core/hle/service/apm/apm_controller.h
similarity index 100%
rename from src/core/hle/service/apm/controller.h
rename to src/core/hle/service/apm/apm_controller.h
diff --git a/src/core/hle/service/apm/interface.cpp b/src/core/hle/service/apm/apm_interface.cpp
similarity index 97%
rename from src/core/hle/service/apm/interface.cpp
rename to src/core/hle/service/apm/apm_interface.cpp
index d69ddd135a..e58bad0833 100644
--- a/src/core/hle/service/apm/interface.cpp
+++ b/src/core/hle/service/apm/apm_interface.cpp
@@ -5,8 +5,8 @@
#include "common/logging/log.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/service/apm/apm.h"
-#include "core/hle/service/apm/controller.h"
-#include "core/hle/service/apm/interface.h"
+#include "core/hle/service/apm/apm_controller.h"
+#include "core/hle/service/apm/apm_interface.h"
namespace Service::APM {
diff --git a/src/core/hle/service/apm/interface.h b/src/core/hle/service/apm/apm_interface.h
similarity index 100%
rename from src/core/hle/service/apm/interface.h
rename to src/core/hle/service/apm/apm_interface.h
diff --git a/src/core/hle/service/bcat/bcat.h b/src/core/hle/service/bcat/bcat.h
index d72798980f..1eba477dad 100644
--- a/src/core/hle/service/bcat/bcat.h
+++ b/src/core/hle/service/bcat/bcat.h
@@ -4,7 +4,7 @@
#pragma once
-#include "core/hle/service/bcat/module.h"
+#include "core/hle/service/bcat/bcat_module.h"
namespace Core {
class System;
diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/bcat_module.cpp
similarity index 99%
rename from src/core/hle/service/bcat/module.cpp
rename to src/core/hle/service/bcat/bcat_module.cpp
index f85444da80..72294eb2e3 100644
--- a/src/core/hle/service/bcat/module.cpp
+++ b/src/core/hle/service/bcat/bcat_module.cpp
@@ -17,7 +17,7 @@
#include "core/hle/kernel/k_writable_event.h"
#include "core/hle/service/bcat/backend/backend.h"
#include "core/hle/service/bcat/bcat.h"
-#include "core/hle/service/bcat/module.h"
+#include "core/hle/service/bcat/bcat_module.h"
#include "core/hle/service/filesystem/filesystem.h"
namespace Service::BCAT {
diff --git a/src/core/hle/service/bcat/module.h b/src/core/hle/service/bcat/bcat_module.h
similarity index 100%
rename from src/core/hle/service/bcat/module.h
rename to src/core/hle/service/bcat/bcat_module.h
diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp
index c5f88bce78..a3c939c0cd 100644
--- a/src/core/hle/service/friend/friend.cpp
+++ b/src/core/hle/service/friend/friend.cpp
@@ -12,7 +12,7 @@
#include "core/hle/kernel/k_writable_event.h"
#include "core/hle/service/friend/errors.h"
#include "core/hle/service/friend/friend.h"
-#include "core/hle/service/friend/interface.h"
+#include "core/hle/service/friend/friend_interface.h"
namespace Service::Friend {
diff --git a/src/core/hle/service/friend/interface.cpp b/src/core/hle/service/friend/friend_interface.cpp
similarity index 92%
rename from src/core/hle/service/friend/interface.cpp
rename to src/core/hle/service/friend/friend_interface.cpp
index 7368ccec2d..9b18b2a322 100644
--- a/src/core/hle/service/friend/interface.cpp
+++ b/src/core/hle/service/friend/friend_interface.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/friend/interface.h"
+#include "core/hle/service/friend/friend_interface.h"
namespace Service::Friend {
diff --git a/src/core/hle/service/friend/interface.h b/src/core/hle/service/friend/friend_interface.h
similarity index 100%
rename from src/core/hle/service/friend/interface.h
rename to src/core/hle/service/friend/friend_interface.h
diff --git a/src/core/hle/service/glue/arp.cpp b/src/core/hle/service/glue/arp.cpp
index ca25df67eb..5a3b54cc11 100644
--- a/src/core/hle/service/glue/arp.cpp
+++ b/src/core/hle/service/glue/arp.cpp
@@ -13,7 +13,7 @@
#include "core/hle/kernel/kernel.h"
#include "core/hle/service/glue/arp.h"
#include "core/hle/service/glue/errors.h"
-#include "core/hle/service/glue/manager.h"
+#include "core/hle/service/glue/glue_manager.h"
#include "core/hle/service/service.h"
namespace Service::Glue {
diff --git a/src/core/hle/service/glue/manager.cpp b/src/core/hle/service/glue/glue_manager.cpp
similarity index 97%
rename from src/core/hle/service/glue/manager.cpp
rename to src/core/hle/service/glue/glue_manager.cpp
index 9b1754cf8c..aa9d48c0ce 100644
--- a/src/core/hle/service/glue/manager.cpp
+++ b/src/core/hle/service/glue/glue_manager.cpp
@@ -3,7 +3,7 @@
// Refer to the license.txt file included.
#include "core/hle/service/glue/errors.h"
-#include "core/hle/service/glue/manager.h"
+#include "core/hle/service/glue/glue_manager.h"
namespace Service::Glue {
diff --git a/src/core/hle/service/glue/manager.h b/src/core/hle/service/glue/glue_manager.h
similarity index 100%
rename from src/core/hle/service/glue/manager.h
rename to src/core/hle/service/glue/glue_manager.h
diff --git a/src/core/hle/service/mii/mii.cpp b/src/core/hle/service/mii/mii.cpp
index bbd81a88ac..9d863486ae 100644
--- a/src/core/hle/service/mii/mii.cpp
+++ b/src/core/hle/service/mii/mii.cpp
@@ -7,8 +7,8 @@
#include "common/logging/log.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/hle_ipc.h"
-#include "core/hle/service/mii/manager.h"
#include "core/hle/service/mii/mii.h"
+#include "core/hle/service/mii/mii_manager.h"
#include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h"
diff --git a/src/core/hle/service/mii/manager.cpp b/src/core/hle/service/mii/mii_manager.cpp
similarity index 99%
rename from src/core/hle/service/mii/manager.cpp
rename to src/core/hle/service/mii/mii_manager.cpp
index 869d2763f0..4fef2aea48 100644
--- a/src/core/hle/service/mii/manager.cpp
+++ b/src/core/hle/service/mii/mii_manager.cpp
@@ -10,7 +10,7 @@
#include "common/string_util.h"
#include "core/hle/service/acc/profile_manager.h"
-#include "core/hle/service/mii/manager.h"
+#include "core/hle/service/mii/mii_manager.h"
#include "core/hle/service/mii/raw_data.h"
#include "core/hle/service/mii/types.h"
diff --git a/src/core/hle/service/mii/manager.h b/src/core/hle/service/mii/mii_manager.h
similarity index 100%
rename from src/core/hle/service/mii/manager.h
rename to src/core/hle/service/mii/mii_manager.h
diff --git a/src/core/hle/service/mii/raw_data.h b/src/core/hle/service/mii/raw_data.h
index 0e35d69d2b..a0d2b9d3a7 100644
--- a/src/core/hle/service/mii/raw_data.h
+++ b/src/core/hle/service/mii/raw_data.h
@@ -7,7 +7,7 @@
#include <array>
#include "common/common_types.h"
-#include "core/hle/service/mii/manager.h"
+#include "core/hle/service/mii/mii_manager.h"
namespace Service::Mii::RawData {
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index 74796dce1c..03992af5e6 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -20,8 +20,8 @@
#include "core/hle/service/nvdrv/devices/nvhost_nvjpg.h"
#include "core/hle/service/nvdrv/devices/nvhost_vic.h"
#include "core/hle/service/nvdrv/devices/nvmap.h"
-#include "core/hle/service/nvdrv/interface.h"
#include "core/hle/service/nvdrv/nvdrv.h"
+#include "core/hle/service/nvdrv/nvdrv_interface.h"
#include "core/hle/service/nvdrv/nvmemp.h"
#include "core/hle/service/nvdrv/syncpoint_manager.h"
#include "core/hle/service/nvflinger/nvflinger.h"
diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/nvdrv_interface.cpp
similarity index 99%
rename from src/core/hle/service/nvdrv/interface.cpp
rename to src/core/hle/service/nvdrv/nvdrv_interface.cpp
index e4d495000b..d61fb73dcb 100644
--- a/src/core/hle/service/nvdrv/interface.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv_interface.cpp
@@ -10,9 +10,9 @@
#include "core/hle/kernel/k_thread.h"
#include "core/hle/kernel/k_writable_event.h"
#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/nvdrv/interface.h"
#include "core/hle/service/nvdrv/nvdata.h"
#include "core/hle/service/nvdrv/nvdrv.h"
+#include "core/hle/service/nvdrv/nvdrv_interface.h"
namespace Service::Nvidia {
diff --git a/src/core/hle/service/nvdrv/interface.h b/src/core/hle/service/nvdrv/nvdrv_interface.h
similarity index 100%
rename from src/core/hle/service/nvdrv/interface.h
rename to src/core/hle/service/nvdrv/nvdrv_interface.h
diff --git a/src/core/hle/service/pctl/pctl.h b/src/core/hle/service/pctl/pctl.h
index ea3b978235..1d28900b2d 100644
--- a/src/core/hle/service/pctl/pctl.h
+++ b/src/core/hle/service/pctl/pctl.h
@@ -4,7 +4,7 @@
#pragma once
-#include "core/hle/service/pctl/module.h"
+#include "core/hle/service/pctl/pctl_module.h"
namespace Core {
class System;
diff --git a/src/core/hle/service/pctl/module.cpp b/src/core/hle/service/pctl/pctl_module.cpp
similarity index 99%
rename from src/core/hle/service/pctl/module.cpp
rename to src/core/hle/service/pctl/pctl_module.cpp
index 1e31d05a69..6949fcf3bf 100644
--- a/src/core/hle/service/pctl/module.cpp
+++ b/src/core/hle/service/pctl/pctl_module.cpp
@@ -8,8 +8,8 @@
#include "core/file_sys/patch_manager.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/kernel/k_process.h"
-#include "core/hle/service/pctl/module.h"
#include "core/hle/service/pctl/pctl.h"
+#include "core/hle/service/pctl/pctl_module.h"
namespace Service::PCTL {
diff --git a/src/core/hle/service/pctl/module.h b/src/core/hle/service/pctl/pctl_module.h
similarity index 100%
rename from src/core/hle/service/pctl/module.h
rename to src/core/hle/service/pctl/pctl_module.h
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 663b83cd37..e6fba88b2e 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -21,7 +21,7 @@
#include "core/hle/service/aoc/aoc_u.h"
#include "core/hle/service/apm/apm.h"
#include "core/hle/service/audio/audio.h"
-#include "core/hle/service/bcat/module.h"
+#include "core/hle/service/bcat/bcat_module.h"
#include "core/hle/service/bpc/bpc.h"
#include "core/hle/service/btdrv/btdrv.h"
#include "core/hle/service/btm/btm.h"
@@ -54,7 +54,7 @@
#include "core/hle/service/nvflinger/nvflinger.h"
#include "core/hle/service/olsc/olsc.h"
#include "core/hle/service/pcie/pcie.h"
-#include "core/hle/service/pctl/module.h"
+#include "core/hle/service/pctl/pctl_module.h"
#include "core/hle/service/pcv/pcv.h"
#include "core/hle/service/pm/pm.h"
#include "core/hle/service/prepo/prepo.h"
@@ -64,7 +64,7 @@
#include "core/hle/service/set/settings.h"
#include "core/hle/service/sm/sm.h"
#include "core/hle/service/sockets/sockets.h"
-#include "core/hle/service/spl/module.h"
+#include "core/hle/service/spl/spl_module.h"
#include "core/hle/service/ssl/ssl.h"
#include "core/hle/service/time/time.h"
#include "core/hle/service/usb/usb.h"
diff --git a/src/core/hle/service/sm/sm.cpp b/src/core/hle/service/sm/sm.cpp
index c7828c3bda..15034abed9 100644
--- a/src/core/hle/service/sm/sm.cpp
+++ b/src/core/hle/service/sm/sm.cpp
@@ -14,8 +14,8 @@
#include "core/hle/kernel/k_server_session.h"
#include "core/hle/kernel/k_session.h"
#include "core/hle/result.h"
-#include "core/hle/service/sm/controller.h"
#include "core/hle/service/sm/sm.h"
+#include "core/hle/service/sm/sm_controller.h"
namespace Service::SM {
diff --git a/src/core/hle/service/sm/controller.cpp b/src/core/hle/service/sm/sm_controller.cpp
similarity index 98%
rename from src/core/hle/service/sm/controller.cpp
rename to src/core/hle/service/sm/sm_controller.cpp
index 8b9418e0fe..b5fbc4569e 100644
--- a/src/core/hle/service/sm/controller.cpp
+++ b/src/core/hle/service/sm/sm_controller.cpp
@@ -13,7 +13,7 @@
#include "core/hle/kernel/k_server_port.h"
#include "core/hle/kernel/k_server_session.h"
#include "core/hle/kernel/k_session.h"
-#include "core/hle/service/sm/controller.h"
+#include "core/hle/service/sm/sm_controller.h"
namespace Service::SM {
diff --git a/src/core/hle/service/sm/controller.h b/src/core/hle/service/sm/sm_controller.h
similarity index 100%
rename from src/core/hle/service/sm/controller.h
rename to src/core/hle/service/sm/sm_controller.h
diff --git a/src/core/hle/service/spl/csrng.h b/src/core/hle/service/spl/csrng.h
index 5c0bd21991..0d03cc6cbc 100644
--- a/src/core/hle/service/spl/csrng.h
+++ b/src/core/hle/service/spl/csrng.h
@@ -4,7 +4,7 @@
#pragma once
-#include "core/hle/service/spl/module.h"
+#include "core/hle/service/spl/spl_module.h"
namespace Core {
class System;
diff --git a/src/core/hle/service/spl/spl.h b/src/core/hle/service/spl/spl.h
index 9b35012edd..5599c0c010 100644
--- a/src/core/hle/service/spl/spl.h
+++ b/src/core/hle/service/spl/spl.h
@@ -4,7 +4,7 @@
#pragma once
-#include "core/hle/service/spl/module.h"
+#include "core/hle/service/spl/spl_module.h"
namespace Core {
class System;
diff --git a/src/core/hle/service/spl/module.cpp b/src/core/hle/service/spl/spl_module.cpp
similarity index 99%
rename from src/core/hle/service/spl/module.cpp
rename to src/core/hle/service/spl/spl_module.cpp
index ebb179aa8a..918633af58 100644
--- a/src/core/hle/service/spl/module.cpp
+++ b/src/core/hle/service/spl/spl_module.cpp
@@ -13,8 +13,8 @@
#include "core/hle/api_version.h"
#include "core/hle/ipc_helpers.h"
#include "core/hle/service/spl/csrng.h"
-#include "core/hle/service/spl/module.h"
#include "core/hle/service/spl/spl.h"
+#include "core/hle/service/spl/spl_module.h"
namespace Service::SPL {
diff --git a/src/core/hle/service/spl/module.h b/src/core/hle/service/spl/spl_module.h
similarity index 100%
rename from src/core/hle/service/spl/module.h
rename to src/core/hle/service/spl/spl_module.h
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp
index d6f710eba1..8fdd5076fb 100644
--- a/src/core/hle/service/time/time.cpp
+++ b/src/core/hle/service/time/time.cpp
@@ -11,8 +11,8 @@
#include "core/hle/kernel/k_client_port.h"
#include "core/hle/kernel/k_scheduler.h"
#include "core/hle/kernel/kernel.h"
-#include "core/hle/service/time/interface.h"
#include "core/hle/service/time/time.h"
+#include "core/hle/service/time/time_interface.h"
#include "core/hle/service/time/time_sharedmemory.h"
#include "core/hle/service/time/time_zone_service.h"
diff --git a/src/core/hle/service/time/interface.cpp b/src/core/hle/service/time/time_interface.cpp
similarity index 97%
rename from src/core/hle/service/time/interface.cpp
rename to src/core/hle/service/time/time_interface.cpp
index 53a2047967..bb7b6b5c1a 100644
--- a/src/core/hle/service/time/interface.cpp
+++ b/src/core/hle/service/time/time_interface.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/time/interface.h"
+#include "core/hle/service/time/time_interface.h"
namespace Service::Time {
diff --git a/src/core/hle/service/time/interface.h b/src/core/hle/service/time/time_interface.h
similarity index 100%
rename from src/core/hle/service/time/interface.h
rename to src/core/hle/service/time/time_interface.h