diff --git a/libstratosphere/include/stratosphere/ro/impl/ro_ro_interface.hpp b/libstratosphere/include/stratosphere/ro/impl/ro_ro_interface.hpp
index 624d1e5d..185293c1 100644
--- a/libstratosphere/include/stratosphere/ro/impl/ro_ro_interface.hpp
+++ b/libstratosphere/include/stratosphere/ro/impl/ro_ro_interface.hpp
@@ -27,7 +27,7 @@ namespace ams::ro::impl {
         AMS_SF_METHOD_INFO(C, H,  2, Result, RegisterModuleInfo,          (const sf::ClientProcessId &client_pid, u64 nrr_address, u64 nrr_size))                                                                                   \
         AMS_SF_METHOD_INFO(C, H,  3, Result, UnregisterModuleInfo,        (const sf::ClientProcessId &client_pid, u64 nrr_address))                                                                                                 \
         AMS_SF_METHOD_INFO(C, H,  4, Result, RegisterProcessHandle,       (const sf::ClientProcessId &client_pid, sf::CopyHandle process_h))                                                                                        \
-        AMS_SF_METHOD_INFO(C, H, 10, Result, RegisterModuleInfoEx,        (const sf::ClientProcessId &client_pid, u64 nrr_address, u64 nrr_size, sf::CopyHandle process_h),                                     hos::Version_7_0_0)
+        AMS_SF_METHOD_INFO(C, H, 10, Result, RegisterProcessModuleInfo,   (const sf::ClientProcessId &client_pid, u64 nrr_address, u64 nrr_size, sf::CopyHandle process_h),                                     hos::Version_7_0_0)
 
     AMS_SF_DEFINE_INTERFACE(IRoInterface, AMS_RO_I_RO_INTERFACE_INTERFACE_INFO)
 
diff --git a/libstratosphere/include/stratosphere/ro/ro_types.hpp b/libstratosphere/include/stratosphere/ro/ro_types.hpp
index eafde873..73aca6e3 100644
--- a/libstratosphere/include/stratosphere/ro/ro_types.hpp
+++ b/libstratosphere/include/stratosphere/ro/ro_types.hpp
@@ -20,10 +20,11 @@
 
 namespace ams::ro {
 
-    enum class ModuleType : u8 {
-        ForSelf   = 0,
-        ForOthers = 1,
-        Count
+    enum NrrKind : u8 {
+        NrrKind_User      = 0,
+        NrrKind_JitPlugin = 1,
+
+        NrrKind_Count,
     };
 
     struct ModuleId {
@@ -54,7 +55,7 @@ namespace ams::ro {
             u8  signature[0x100];
             ncm::ProgramId program_id;
             u32 size;
-            u8  type; /* 7.0.0+ */
+            u8  nrr_kind; /* 7.0.0+ */
             u8  reserved_33D[3];
             u32 hashes_offset;
             u32 num_hashes;
@@ -68,10 +69,10 @@ namespace ams::ro {
                 return (static_cast<u64>(this->program_id) & this->certification.program_id_mask) == this->certification.program_id_pattern;
             }
 
-            ModuleType GetType() const {
-                const ModuleType type = static_cast<ModuleType>(this->type);
-                AMS_ABORT_UNLESS(type < ModuleType::Count);
-                return type;
+            NrrKind GetNrrKind() const {
+                const NrrKind kind = static_cast<NrrKind>(this->nrr_kind);
+                AMS_ABORT_UNLESS(kind < NrrKind_Count);
+                return kind;
             }
 
             ncm::ProgramId GetProgramId() const {
diff --git a/libvapours/include/vapours/results/ro_results.hpp b/libvapours/include/vapours/results/ro_results.hpp
index fc4dbe16..8614e400 100644
--- a/libvapours/include/vapours/results/ro_results.hpp
+++ b/libvapours/include/vapours/results/ro_results.hpp
@@ -30,7 +30,7 @@ namespace ams::ro {
         R_DEFINE_ERROR_RESULT(TooManyNro,               7);
         R_DEFINE_ERROR_RESULT(TooManyNrr,               8);
         R_DEFINE_ERROR_RESULT(NotAuthorized,            9);
-        R_DEFINE_ERROR_RESULT(InvalidNrrType,           10);
+        R_DEFINE_ERROR_RESULT(InvalidNrrKind,           10);
 
         R_DEFINE_ERROR_RESULT(InternalError,            1023);