6 files changed, 21 insertions, 21 deletions

diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index 93b9f793e..7ec62cf18 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -21,12 +21,12 @@
 #include "core/hle/kernel/k_scheduler.h"
 #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
 #include "core/hle/kernel/k_thread.h"
+#include "core/hle/kernel/k_writable_event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/server_session.h"
 #include "core/hle/kernel/time_manager.h"
-#include "core/hle/kernel/writable_event.h"
 #include "core/memory.h"
 
 namespace Kernel {
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 89ae2a329..9a769781b 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -42,7 +42,7 @@ class Process;
 class ServerSession;
 class KThread;
 class KReadableEvent;
-class WritableEvent;
+class KWritableEvent;
 
 enum class ThreadWakeupReason;
 
diff --git a/src/core/hle/kernel/k_readable_event.h b/src/core/hle/kernel/k_readable_event.h
index 50dfc60d3..39eedc411 100644
--- a/src/core/hle/kernel/k_readable_event.h
+++ b/src/core/hle/kernel/k_readable_event.h
@@ -12,10 +12,10 @@ union ResultCode;
 namespace Kernel {
 
 class KernelCore;
-class WritableEvent;
+class KWritableEvent;
 
 class KReadableEvent final : public KSynchronizationObject {
-    friend class WritableEvent;
+    friend class KWritableEvent;
 
 public:
     ~KReadableEvent() override;
diff --git a/src/core/hle/kernel/writable_event.cpp b/src/core/hle/kernel/k_writable_event.cpp
index 0d261e6e8..d2857b4c3 100644
--- a/src/core/hle/kernel/writable_event.cpp
+++ b/src/core/hle/kernel/k_writable_event.cpp
@@ -6,17 +6,17 @@
 #include "common/assert.h"
 #include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/kernel/k_thread.h"
+#include "core/hle/kernel/k_writable_event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/object.h"
-#include "core/hle/kernel/writable_event.h"
 
 namespace Kernel {
 
-WritableEvent::WritableEvent(KernelCore& kernel) : Object{kernel} {}
-WritableEvent::~WritableEvent() = default;
+KWritableEvent::KWritableEvent(KernelCore& kernel) : Object{kernel} {}
+KWritableEvent::~KWritableEvent() = default;
 
-EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) {
-    std::shared_ptr<WritableEvent> writable_event(new WritableEvent(kernel));
+EventPair KWritableEvent::CreateEventPair(KernelCore& kernel, std::string name) {
+    std::shared_ptr<KWritableEvent> writable_event(new KWritableEvent(kernel));
     std::shared_ptr<KReadableEvent> readable_event(new KReadableEvent(kernel));
 
     writable_event->name = name + ":Writable";
@@ -26,15 +26,15 @@ EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) {
     return {std::move(readable_event), std::move(writable_event)};
 }
 
-std::shared_ptr<KReadableEvent> WritableEvent::GetReadableEvent() const {
+std::shared_ptr<KReadableEvent> KWritableEvent::GetReadableEvent() const {
     return readable;
 }
 
-void WritableEvent::Signal() {
+void KWritableEvent::Signal() {
     readable->Signal();
 }
 
-void WritableEvent::Clear() {
+void KWritableEvent::Clear() {
     readable->Clear();
 }
 
diff --git a/src/core/hle/kernel/writable_event.h b/src/core/hle/kernel/k_writable_event.h
index b288267c5..ad5514b52 100644
--- a/src/core/hle/kernel/writable_event.h
+++ b/src/core/hle/kernel/k_writable_event.h
@@ -12,16 +12,16 @@ namespace Kernel {
 
 class KernelCore;
 class KReadableEvent;
-class WritableEvent;
+class KWritableEvent;
 
 struct EventPair {
     std::shared_ptr<KReadableEvent> readable;
-    std::shared_ptr<WritableEvent> writable;
+    std::shared_ptr<KWritableEvent> writable;
 };
 
-class WritableEvent final : public Object {
+class KWritableEvent final : public Object {
 public:
-    ~WritableEvent() override;
+    ~KWritableEvent() override;
 
     /**
      * Creates an event
@@ -50,7 +50,7 @@ public:
     void Finalize() override {}
 
 private:
-    explicit WritableEvent(KernelCore& kernel);
+    explicit KWritableEvent(KernelCore& kernel);
 
     std::shared_ptr<KReadableEvent> readable;
 
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 1d2a2c321..f94eecbb8 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -32,6 +32,7 @@
 #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
 #include "core/hle/kernel/k_synchronization_object.h"
 #include "core/hle/kernel/k_thread.h"
+#include "core/hle/kernel/k_writable_event.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/memory/memory_block.h"
 #include "core/hle/kernel/memory/memory_layout.h"
@@ -45,7 +46,6 @@
 #include "core/hle/kernel/svc_wrap.h"
 #include "core/hle/kernel/time_manager.h"
 #include "core/hle/kernel/transfer_memory.h"
-#include "core/hle/kernel/writable_event.h"
 #include "core/hle/lock.h"
 #include "core/hle/result.h"
 #include "core/hle/service/service.h"
@@ -1871,7 +1871,7 @@ static ResultCode CreateEvent(Core::System& system, Handle* write_handle, Handle
 
     auto& kernel = system.Kernel();
     const auto [readable_event, writable_event] =
-        WritableEvent::CreateEventPair(kernel, "CreateEvent");
+        KWritableEvent::CreateEventPair(kernel, "CreateEvent");
 
     HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable();
 
@@ -1903,7 +1903,7 @@ static ResultCode ClearEvent(Core::System& system, Handle handle) {
 
     const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();
 
-    auto writable_event = handle_table.Get<WritableEvent>(handle);
+    auto writable_event = handle_table.Get<KWritableEvent>(handle);
     if (writable_event) {
         writable_event->Clear();
         return RESULT_SUCCESS;
@@ -1927,7 +1927,7 @@ static ResultCode SignalEvent(Core::System& system, Handle handle) {
     LOG_DEBUG(Kernel_SVC, "called. Handle=0x{:08X}", handle);
 
     HandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();
-    auto writable_event = handle_table.Get<WritableEvent>(handle);
+    auto writable_event = handle_table.Get<KWritableEvent>(handle);
 
     if (!writable_event) {
         LOG_ERROR(Kernel_SVC, "Non-existent writable event handle used (0x{:08X})", handle);