diff --git a/libstratosphere/include/stratosphere/gpio/driver/board/nintendo/nx/gpio_driver_api.hpp b/libstratosphere/include/stratosphere/gpio/driver/board/nintendo/nx/gpio_driver_api.hpp
index 4245007b..a9c34a7d 100644
--- a/libstratosphere/include/stratosphere/gpio/driver/board/nintendo/nx/gpio_driver_api.hpp
+++ b/libstratosphere/include/stratosphere/gpio/driver/board/nintendo/nx/gpio_driver_api.hpp
@@ -18,7 +18,7 @@
 #include <stratosphere/gpio/gpio_types.hpp>
 #include <stratosphere/gpio/driver/gpio_i_gpio_driver.hpp>
 
-namespace ams::gpio::driver::board::nintendo_nx {
+namespace ams::gpio::driver::board::nintendo::nx {
 
     void Initialize(bool enable_interrupt_handlers);
 
diff --git a/libstratosphere/include/stratosphere/gpio/driver/gpio_select_driver_api.hpp b/libstratosphere/include/stratosphere/gpio/driver/gpio_select_driver_api.hpp
index 9f420972..4764dcac 100644
--- a/libstratosphere/include/stratosphere/gpio/driver/gpio_select_driver_api.hpp
+++ b/libstratosphere/include/stratosphere/gpio/driver/gpio_select_driver_api.hpp
@@ -26,7 +26,7 @@
 
     namespace ams::gpio::driver::board {
 
-        using namespace ams::gpio::driver::board::nintendo_nx;
+        using namespace ams::gpio::driver::board::nintendo::nx;
 
     }
 
diff --git a/libstratosphere/include/stratosphere/i2c/driver/board/nintendo/nx/i2c_driver_api.hpp b/libstratosphere/include/stratosphere/i2c/driver/board/nintendo/nx/i2c_driver_api.hpp
index 67bf0821..c5501223 100644
--- a/libstratosphere/include/stratosphere/i2c/driver/board/nintendo/nx/i2c_driver_api.hpp
+++ b/libstratosphere/include/stratosphere/i2c/driver/board/nintendo/nx/i2c_driver_api.hpp
@@ -17,7 +17,7 @@
 #include <vapours.hpp>
 #include <stratosphere/i2c/i2c_types.hpp>
 
-namespace ams::i2c::driver::board::nintendo_nx {
+namespace ams::i2c::driver::board::nintendo::nx {
 
     void Initialize();
 
diff --git a/libstratosphere/include/stratosphere/i2c/driver/i2c_select_driver_api.hpp b/libstratosphere/include/stratosphere/i2c/driver/i2c_select_driver_api.hpp
index c9152aed..ba8d8e2f 100644
--- a/libstratosphere/include/stratosphere/i2c/driver/i2c_select_driver_api.hpp
+++ b/libstratosphere/include/stratosphere/i2c/driver/i2c_select_driver_api.hpp
@@ -25,7 +25,7 @@
 
     namespace ams::i2c::driver::board {
 
-        using namespace ams::i2c::driver::board::nintendo_nx;
+        using namespace ams::i2c::driver::board::nintendo::nx;
 
     }
 
diff --git a/libstratosphere/include/stratosphere/pwm/driver/board/nintendo/nx/pwm_driver_api.hpp b/libstratosphere/include/stratosphere/pwm/driver/board/nintendo/nx/pwm_driver_api.hpp
index 0a9b0030..666c9d28 100644
--- a/libstratosphere/include/stratosphere/pwm/driver/board/nintendo/nx/pwm_driver_api.hpp
+++ b/libstratosphere/include/stratosphere/pwm/driver/board/nintendo/nx/pwm_driver_api.hpp
@@ -17,7 +17,7 @@
 #include <vapours.hpp>
 #include <stratosphere/pwm/pwm_types.hpp>
 
-namespace ams::pwm::driver::board::nintendo_nx {
+namespace ams::pwm::driver::board::nintendo::nx {
 
     void Initialize();
 
diff --git a/libstratosphere/include/stratosphere/pwm/driver/pwm_select_driver_api.hpp b/libstratosphere/include/stratosphere/pwm/driver/pwm_select_driver_api.hpp
index 4499240b..b1264533 100644
--- a/libstratosphere/include/stratosphere/pwm/driver/pwm_select_driver_api.hpp
+++ b/libstratosphere/include/stratosphere/pwm/driver/pwm_select_driver_api.hpp
@@ -24,7 +24,7 @@
 
     namespace ams::pwm::driver::board {
 
-        using namespace ams::pwm::driver::board::nintendo_nx;
+        using namespace ams::pwm::driver::board::nintendo::nx;
 
     }
 
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/gpio_driver_api.cpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/gpio_driver_api.cpp
index 513add68..e04a74d2 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/gpio_driver_api.cpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/gpio_driver_api.cpp
@@ -18,11 +18,11 @@
 #include "impl/gpio_initial_config.hpp"
 #include "impl/gpio_tegra_pad.hpp"
 
-namespace ams::gpio::driver::board::nintendo_nx {
+namespace ams::gpio::driver::board::nintendo::nx {
 
     namespace {
 
-        ams::gpio::driver::board::nintendo_nx::impl::DriverImpl *g_driver_impl = nullptr;
+        ams::gpio::driver::board::nintendo::nx::impl::DriverImpl *g_driver_impl = nullptr;
 
     }
 
@@ -38,7 +38,7 @@ namespace ams::gpio::driver::board::nintendo_nx {
         AMS_ABORT_UNLESS(driver_storage != nullptr);
 
         /* Construct the new driver. */
-        g_driver_impl = new (driver_storage) ams::gpio::driver::board::nintendo_nx::impl::DriverImpl(impl::GpioRegistersPhysicalAddress, impl::GpioRegistersSize);
+        g_driver_impl = new (driver_storage) ams::gpio::driver::board::nintendo::nx::impl::DriverImpl(impl::GpioRegistersPhysicalAddress, impl::GpioRegistersSize);
 
         /* Register the driver. */
         gpio::driver::RegisterDriver(g_driver_impl);
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_driver_impl.cpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_driver_impl.cpp
index aa152fb7..1e413010 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_driver_impl.cpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_driver_impl.cpp
@@ -17,7 +17,7 @@
 #include "gpio_driver_impl.hpp"
 #include "gpio_register_accessor.hpp"
 
-namespace ams::gpio::driver::board::nintendo_nx::impl {
+namespace ams::gpio::driver::board::nintendo::nx::impl {
 
     void InterruptEventHandler::Initialize(DriverImpl *drv, os::InterruptName intr, int ctlr) {
         /* Set fields. */
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_driver_impl.hpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_driver_impl.hpp
index b78f341d..90fdfcc3 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_driver_impl.hpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_driver_impl.hpp
@@ -20,7 +20,7 @@
 #include "gpio_register_accessor.hpp"
 #include "gpio_suspend_handler.hpp"
 
-namespace ams::gpio::driver::board::nintendo_nx::impl {
+namespace ams::gpio::driver::board::nintendo::nx::impl {
 
     class DriverImpl;
 
@@ -43,7 +43,7 @@ namespace ams::gpio::driver::board::nintendo_nx::impl {
     class DriverImpl : public ::ams::gpio::driver::IGpioDriver {
         NON_COPYABLE(DriverImpl);
         NON_MOVEABLE(DriverImpl);
-        AMS_DDSF_CASTABLE_TRAITS(ams::gpio::driver::board::nintendo_nx::impl::DriverImpl, ::ams::gpio::driver::IGpioDriver);
+        AMS_DDSF_CASTABLE_TRAITS(ams::gpio::driver::board::nintendo::nx::impl::DriverImpl, ::ams::gpio::driver::IGpioDriver);
         friend class InterruptEventHandler;
         private:
             dd::PhysicalAddress gpio_physical_address;
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_initial_config.cpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_initial_config.cpp
index b6b10224..a5a8a0e5 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_initial_config.cpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_initial_config.cpp
@@ -18,7 +18,7 @@
 #include "gpio_initial_config.hpp"
 #include "gpio_wake_pin_config.hpp"
 
-namespace ams::gpio::driver::board::nintendo_nx::impl {
+namespace ams::gpio::driver::board::nintendo::nx::impl {
 
     namespace {
 
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_initial_config.hpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_initial_config.hpp
index d577ccc3..498ebe2a 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_initial_config.hpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_initial_config.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::gpio::driver::board::nintendo_nx::impl {
+namespace ams::gpio::driver::board::nintendo::nx::impl {
 
     struct GpioInitialConfig {
         DeviceCode      device_code;
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_register_accessor.hpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_register_accessor.hpp
index c9b2f6e6..40d92e4c 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_register_accessor.hpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_register_accessor.hpp
@@ -18,7 +18,7 @@
 
 #include "gpio_tegra_pad.hpp"
 
-namespace ams::gpio::driver::board::nintendo_nx::impl {
+namespace ams::gpio::driver::board::nintendo::nx::impl {
 
     constexpr inline dd::PhysicalAddress GpioRegistersPhysicalAddress = 0x6000D000;
     constexpr inline size_t GpioRegistersSize                         = 4_KB;
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_suspend_handler.cpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_suspend_handler.cpp
index a922b212..9689c51b 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_suspend_handler.cpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_suspend_handler.cpp
@@ -16,7 +16,7 @@
 #include <stratosphere.hpp>
 #include "gpio_suspend_handler.hpp"
 
-namespace ams::gpio::driver::board::nintendo_nx::impl {
+namespace ams::gpio::driver::board::nintendo::nx::impl {
 
     void SuspendHandler::Initialize(uintptr_t gpio_vaddr) {
         /* Set our gpio virtual address. */
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_suspend_handler.hpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_suspend_handler.hpp
index faaf59b0..3daa2204 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_suspend_handler.hpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_suspend_handler.hpp
@@ -18,7 +18,7 @@
 
 #include "gpio_tegra_pad.hpp"
 
-namespace ams::gpio::driver::board::nintendo_nx::impl {
+namespace ams::gpio::driver::board::nintendo::nx::impl {
 
     class SuspendHandler {
         NON_COPYABLE(SuspendHandler);
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_tegra_pad.hpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_tegra_pad.hpp
index 67c09390..c136220f 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_tegra_pad.hpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_tegra_pad.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::gpio::driver::board::nintendo_nx::impl {
+namespace ams::gpio::driver::board::nintendo::nx::impl {
 
     enum GpioPadPort {
         GpioPadPort_A     =  0,
@@ -347,7 +347,7 @@ namespace ams::gpio::driver::board::nintendo_nx::impl {
     };
 
     class TegraPad : public ::ams::gpio::driver::Pad {
-        AMS_DDSF_CASTABLE_TRAITS(ams::gpio::driver::board::nintendo_nx::impl::TegraPad, ::ams::gpio::driver::Pad);
+        AMS_DDSF_CASTABLE_TRAITS(ams::gpio::driver::board::nintendo::nx::impl::TegraPad, ::ams::gpio::driver::Pad);
         private:
             using Base = ::ams::gpio::driver::Pad;
         private:
diff --git a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_wake_pin_config.hpp b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_wake_pin_config.hpp
index 9b251437..61c82970 100644
--- a/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_wake_pin_config.hpp
+++ b/libstratosphere/source/gpio/driver/board/nintendo/nx/impl/gpio_wake_pin_config.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::gpio::driver::board::nintendo_nx::impl {
+namespace ams::gpio::driver::board::nintendo::nx::impl {
 
     struct WakePinConfig {
         wec::WakeEvent wake_event;
diff --git a/libstratosphere/source/i2c/driver/board/nintendo/nx/i2c_driver_api.cpp b/libstratosphere/source/i2c/driver/board/nintendo/nx/i2c_driver_api.cpp
index bab1817f..5f2c874a 100644
--- a/libstratosphere/source/i2c/driver/board/nintendo/nx/i2c_driver_api.cpp
+++ b/libstratosphere/source/i2c/driver/board/nintendo/nx/i2c_driver_api.cpp
@@ -17,7 +17,7 @@
 #include "impl/i2c_bus_manager.hpp"
 #include "impl/i2c_device_property_manager.hpp"
 
-namespace ams::i2c::driver::board::nintendo_nx {
+namespace ams::i2c::driver::board::nintendo::nx {
 
     namespace {
 
diff --git a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_accessor.cpp b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_accessor.cpp
index 5e8dff88..b0dd6dbc 100644
--- a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_accessor.cpp
+++ b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_accessor.cpp
@@ -16,7 +16,7 @@
 #include <stratosphere.hpp>
 #include "i2c_bus_accessor.hpp"
 
-namespace ams::i2c::driver::board::nintendo_nx::impl {
+namespace ams::i2c::driver::board::nintendo::nx::impl {
 
     namespace {
 
diff --git a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_accessor.hpp b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_accessor.hpp
index 8691dbaf..7a59c64c 100644
--- a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_accessor.hpp
+++ b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_accessor.hpp
@@ -17,12 +17,12 @@
 #include <stratosphere.hpp>
 #include "i2c_i2c_registers.hpp"
 
-namespace ams::i2c::driver::board::nintendo_nx::impl {
+namespace ams::i2c::driver::board::nintendo::nx::impl {
 
     class I2cBusAccessor : public ::ams::i2c::driver::II2cDriver {
         NON_COPYABLE(I2cBusAccessor);
         NON_MOVEABLE(I2cBusAccessor);
-        AMS_DDSF_CASTABLE_TRAITS(ams::i2c::driver::board::nintendo_nx::impl::I2cBusAccessor, ::ams::i2c::driver::II2cDriver);
+        AMS_DDSF_CASTABLE_TRAITS(ams::i2c::driver::board::nintendo::nx::impl::I2cBusAccessor, ::ams::i2c::driver::II2cDriver);
         private:
             enum class State {
                 NotInitialized    = 0,
diff --git a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_manager.hpp b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_manager.hpp
index 64ae4668..358badce 100644
--- a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_manager.hpp
+++ b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_bus_manager.hpp
@@ -18,7 +18,7 @@
 #include "i2c_bus_accessor.hpp"
 #include "i2c_i_allocator.hpp"
 
-namespace ams::i2c::driver::board::nintendo_nx::impl {
+namespace ams::i2c::driver::board::nintendo::nx::impl {
 
     class I2cBusAccessorManager : public IAllocator<I2cBusAccessor::BusAccessorList> {
         /* ... */
diff --git a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_device_property_manager.hpp b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_device_property_manager.hpp
index 726d8763..e0a1e22d 100644
--- a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_device_property_manager.hpp
+++ b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_device_property_manager.hpp
@@ -17,7 +17,7 @@
 #include <stratosphere.hpp>
 #include "i2c_i_allocator.hpp"
 
-namespace ams::i2c::driver::board::nintendo_nx::impl {
+namespace ams::i2c::driver::board::nintendo::nx::impl {
 
     class I2cDevicePropertyManager : public IAllocator<I2cDeviceProperty::DevicePropertyList> {
         /* ... */
diff --git a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_i2c_registers.hpp b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_i2c_registers.hpp
index c8925ce6..9b933bea 100644
--- a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_i2c_registers.hpp
+++ b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_i2c_registers.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::i2c::driver::board::nintendo_nx::impl {
+namespace ams::i2c::driver::board::nintendo::nx::impl {
 
     struct I2cRegisters {
         volatile u32 cnfg;
diff --git a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_i_allocator.hpp b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_i_allocator.hpp
index 270c882e..71e264d9 100644
--- a/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_i_allocator.hpp
+++ b/libstratosphere/source/i2c/driver/board/nintendo/nx/impl/i2c_i_allocator.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::i2c::driver::board::nintendo_nx::impl {
+namespace ams::i2c::driver::board::nintendo::nx::impl {
 
     template<typename ListType>
     class IAllocator {
diff --git a/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_board_driver_api.cpp b/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_board_driver_api.cpp
index fc35ce96..93839894 100644
--- a/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_board_driver_api.cpp
+++ b/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_board_driver_api.cpp
@@ -18,7 +18,7 @@
 #include "pinmux_board_driver_api.hpp"
 #include "pinmux_platform_pads.hpp"
 
-namespace ams::pinmux::driver::board::nintendo_nx {
+namespace ams::pinmux::driver::board::nintendo::nx {
 
     namespace {
 
diff --git a/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_board_driver_api.hpp b/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_board_driver_api.hpp
index 48be15d8..8d3cfafa 100644
--- a/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_board_driver_api.hpp
+++ b/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_board_driver_api.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::pinmux::driver::board::nintendo_nx {
+namespace ams::pinmux::driver::board::nintendo::nx {
 
     bool IsInitialized();
 
diff --git a/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_platform_pads.cpp b/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_platform_pads.cpp
index 7efce9dc..eb30b7e9 100644
--- a/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_platform_pads.cpp
+++ b/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_platform_pads.cpp
@@ -18,7 +18,7 @@
 #include "pinmux_board_driver_api.hpp"
 #include "pinmux_platform_pads.hpp"
 
-namespace ams::pinmux::driver::board::nintendo_nx {
+namespace ams::pinmux::driver::board::nintendo::nx {
 
     namespace {
 
diff --git a/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_platform_pads.hpp b/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_platform_pads.hpp
index 144bf52d..05c9e1ab 100644
--- a/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_platform_pads.hpp
+++ b/libstratosphere/source/pinmux/driver/board/nintendo/nx/pinmux_platform_pads.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::pinmux::driver::board::nintendo_nx {
+namespace ams::pinmux::driver::board::nintendo::nx {
 
     struct PinmuxPadConfig {
         u32 index;
diff --git a/libstratosphere/source/pinmux/driver/pinmux_select_board_impl.hpp b/libstratosphere/source/pinmux/driver/pinmux_select_board_impl.hpp
index 1da07aec..2865d5cf 100644
--- a/libstratosphere/source/pinmux/driver/pinmux_select_board_impl.hpp
+++ b/libstratosphere/source/pinmux/driver/pinmux_select_board_impl.hpp
@@ -20,7 +20,7 @@
 
     #include "board/nintendo/nx/pinmux_board_driver_api.hpp"
     namespace ams::pinmux::driver::board {
-        using namespace ams::pinmux::driver::board::nintendo_nx;
+        using namespace ams::pinmux::driver::board::nintendo::nx;
     }
 
 #else
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.cpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.cpp
index c1b3be26..4671d411 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.cpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.cpp
@@ -19,7 +19,7 @@
 #include "powctl_battery_driver.hpp"
 #include "powctl_max17050_driver.hpp"
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     namespace {
 
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.hpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.hpp
index 1221e0ba..a95e3b83 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.hpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_battery_driver.hpp
@@ -18,12 +18,12 @@
 #include "../../../powctl_i_power_control_driver.hpp"
 #include "powctl_interrupt_event_handler.hpp"
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     class BatteryDevice : public powctl::impl::IDevice {
         NON_COPYABLE(BatteryDevice);
         NON_MOVEABLE(BatteryDevice);
-        AMS_DDSF_CASTABLE_TRAITS(ams::powctl::impl::board::nintendo_nx::BatteryDevice, ::ams::powctl::impl::IDevice);
+        AMS_DDSF_CASTABLE_TRAITS(ams::powctl::impl::board::nintendo::nx::BatteryDevice, ::ams::powctl::impl::IDevice);
         private:
             bool use_event_handler;
             std::optional<BatteryInterruptEventHandler> event_handler;
@@ -43,7 +43,7 @@ namespace ams::powctl::impl::board::nintendo_nx {
     class BatteryDriver : public IPowerControlDriver {
         NON_COPYABLE(BatteryDriver);
         NON_MOVEABLE(BatteryDriver);
-        AMS_DDSF_CASTABLE_TRAITS(ams::powctl::impl::board::nintendo_nx::BatteryDriver, ::ams::powctl::impl::IPowerControlDriver);
+        AMS_DDSF_CASTABLE_TRAITS(ams::powctl::impl::board::nintendo::nx::BatteryDriver, ::ams::powctl::impl::IPowerControlDriver);
         public:
             BatteryDriver(bool ev) : IPowerControlDriver(ev) { /* ... */ }
 
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_board_impl.cpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_board_impl.cpp
index 4fe399e9..ade5d5ab 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_board_impl.cpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_board_impl.cpp
@@ -19,7 +19,7 @@
 #include "powctl_battery_driver.hpp"
 #include "powctl_charger_driver.hpp"
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     namespace {
 
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_board_impl.hpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_board_impl.hpp
index 902c5e99..8db008eb 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_board_impl.hpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_board_impl.hpp
@@ -18,7 +18,7 @@
 
 #include "powctl_interrupt_event_handler.hpp"
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     void Initialize(bool use_event_handlers);
     void Finalize();
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_bq24193_driver.cpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_bq24193_driver.cpp
index 32fa8a94..8b4dbb00 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_bq24193_driver.cpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_bq24193_driver.cpp
@@ -16,7 +16,7 @@
 #include <stratosphere.hpp>
 #include "powctl_bq24193_driver.hpp"
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     namespace bq24193 {
 
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_bq24193_driver.hpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_bq24193_driver.hpp
index 01d9b906..daf8938f 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_bq24193_driver.hpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_bq24193_driver.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     namespace bq24193 {
 
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.cpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.cpp
index 08e1c9a3..de86f635 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.cpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.cpp
@@ -19,7 +19,7 @@
 #include "powctl_charger_driver.hpp"
 #include "powctl_bq24193_driver.hpp"
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     namespace {
 
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.hpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.hpp
index 680d44cd..c9f2c3e1 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.hpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_charger_driver.hpp
@@ -18,12 +18,12 @@
 #include "../../../powctl_i_power_control_driver.hpp"
 #include "powctl_interrupt_event_handler.hpp"
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     class ChargerDevice : public powctl::impl::IDevice {
         NON_COPYABLE(ChargerDevice);
         NON_MOVEABLE(ChargerDevice);
-        AMS_DDSF_CASTABLE_TRAITS(ams::powctl::impl::board::nintendo_nx::ChargerDevice, ::ams::powctl::impl::IDevice);
+        AMS_DDSF_CASTABLE_TRAITS(ams::powctl::impl::board::nintendo::nx::ChargerDevice, ::ams::powctl::impl::IDevice);
         private:
             gpio::GpioPadSession gpio_pad_session;
             bool watchdog_timer_enabled;
@@ -54,7 +54,7 @@ namespace ams::powctl::impl::board::nintendo_nx {
     class ChargerDriver : public IPowerControlDriver {
         NON_COPYABLE(ChargerDriver);
         NON_MOVEABLE(ChargerDriver);
-        AMS_DDSF_CASTABLE_TRAITS(ams::powctl::impl::board::nintendo_nx::ChargerDriver, ::ams::powctl::impl::IPowerControlDriver);
+        AMS_DDSF_CASTABLE_TRAITS(ams::powctl::impl::board::nintendo::nx::ChargerDriver, ::ams::powctl::impl::IPowerControlDriver);
         public:
             ChargerDriver(bool ev) : IPowerControlDriver(ev) { /* ... */ }
 
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_interrupt_event_handler.cpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_interrupt_event_handler.cpp
index 360abece..e6dc125a 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_interrupt_event_handler.cpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_interrupt_event_handler.cpp
@@ -16,7 +16,7 @@
 #include <stratosphere.hpp>
 #include "powctl_interrupt_event_handler.hpp"
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     void ChargerInterruptEventHandler::SignalEvent(IDevice *device) {
         /* TODO */
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_interrupt_event_handler.hpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_interrupt_event_handler.hpp
index b445302e..6ccd6e75 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_interrupt_event_handler.hpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_interrupt_event_handler.hpp
@@ -17,7 +17,7 @@
 #include <stratosphere.hpp>
 #include "../../../powctl_i_power_control_driver.hpp"
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     template<typename Derived>
     class InterruptEventHandler : public ddsf::IEventHandler {
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_max17050_driver.cpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_max17050_driver.cpp
index 424c65b5..c1e7222c 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_max17050_driver.cpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_max17050_driver.cpp
@@ -20,7 +20,7 @@
 #include <arm_neon.h>
 #endif
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     namespace max17050 {
 
diff --git a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_max17050_driver.hpp b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_max17050_driver.hpp
index 7d01e30f..e5a39fa7 100644
--- a/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_max17050_driver.hpp
+++ b/libstratosphere/source/powctl/impl/board/nintendo/nx/powctl_max17050_driver.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::powctl::impl::board::nintendo_nx {
+namespace ams::powctl::impl::board::nintendo::nx {
 
     namespace max17050 {
 
diff --git a/libstratosphere/source/powctl/impl/powctl_select_board_driver.hpp b/libstratosphere/source/powctl/impl/powctl_select_board_driver.hpp
index 7df69d25..6f2cb6bb 100644
--- a/libstratosphere/source/powctl/impl/powctl_select_board_driver.hpp
+++ b/libstratosphere/source/powctl/impl/powctl_select_board_driver.hpp
@@ -22,7 +22,7 @@
     #include "board/nintendo/nx/powctl_board_impl.hpp"
 
     namespace ams::powctl::impl::board {
-        using namespace ams::powctl::impl::board::nintendo_nx;
+        using namespace ams::powctl::impl::board::nintendo::nx;
     }
 
 #else
diff --git a/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_impl_pwm_driver_api.cpp b/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_impl_pwm_driver_api.cpp
index 1b1849d1..9cc52cf6 100644
--- a/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_impl_pwm_driver_api.cpp
+++ b/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_impl_pwm_driver_api.cpp
@@ -17,7 +17,7 @@
 #include "pwm_impl_pwm_driver_api.hpp"
 #include "pwm_pwm_driver_impl.hpp"
 
-namespace ams::pwm::driver::board::nintendo_nx::impl {
+namespace ams::pwm::driver::board::nintendo::nx::impl {
 
     namespace {
 
diff --git a/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_impl_pwm_driver_api.hpp b/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_impl_pwm_driver_api.hpp
index 9ce8137d..5177ad47 100644
--- a/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_impl_pwm_driver_api.hpp
+++ b/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_impl_pwm_driver_api.hpp
@@ -16,7 +16,7 @@
 #pragma once
 #include <stratosphere.hpp>
 
-namespace ams::pwm::driver::board::nintendo_nx::impl {
+namespace ams::pwm::driver::board::nintendo::nx::impl {
 
     struct ChannelDefinition {
         DeviceCode device_code;
diff --git a/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.cpp b/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.cpp
index 353148e5..e9ed7336 100644
--- a/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.cpp
+++ b/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.cpp
@@ -16,7 +16,7 @@
 #include <stratosphere.hpp>
 #include "pwm_pwm_driver_impl.hpp"
 
-namespace ams::pwm::driver::board::nintendo_nx::impl {
+namespace ams::pwm::driver::board::nintendo::nx::impl {
 
     namespace {
 
diff --git a/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.hpp b/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.hpp
index d04e841b..1a75fbac 100644
--- a/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.hpp
+++ b/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.hpp
@@ -17,12 +17,12 @@
 #include <stratosphere.hpp>
 #include "pwm_impl_pwm_driver_api.hpp"
 
-namespace ams::pwm::driver::board::nintendo_nx::impl {
+namespace ams::pwm::driver::board::nintendo::nx::impl {
 
     class PwmDeviceImpl : public ::ams::pwm::driver::IPwmDevice {
         NON_COPYABLE(PwmDeviceImpl);
         NON_MOVEABLE(PwmDeviceImpl);
-        AMS_DDSF_CASTABLE_TRAITS(ams::pwm::driver::board::nintendo_nx::impl::PwmDeviceImpl, ::ams::pwm::driver::IPwmDevice);
+        AMS_DDSF_CASTABLE_TRAITS(ams::pwm::driver::board::nintendo::nx::impl::PwmDeviceImpl, ::ams::pwm::driver::IPwmDevice);
         private:
             os::SdkMutex suspend_mutex;
             u32 suspend_value;
@@ -39,7 +39,7 @@ namespace ams::pwm::driver::board::nintendo_nx::impl {
     class PwmDriverImpl : public ::ams::pwm::driver::IPwmDriver {
         NON_COPYABLE(PwmDriverImpl);
         NON_MOVEABLE(PwmDriverImpl);
-        AMS_DDSF_CASTABLE_TRAITS(ams::pwm::driver::board::nintendo_nx::impl::PwmDriverImpl, ::ams::pwm::driver::IPwmDriver);
+        AMS_DDSF_CASTABLE_TRAITS(ams::pwm::driver::board::nintendo::nx::impl::PwmDriverImpl, ::ams::pwm::driver::IPwmDriver);
         private:
             dd::PhysicalAddress registers_phys_addr;
             size_t registers_size;
diff --git a/libstratosphere/source/pwm/driver/board/nintendo/nx/pwm_driver_api.cpp b/libstratosphere/source/pwm/driver/board/nintendo/nx/pwm_driver_api.cpp
index 0b8442e3..0cc03378 100644
--- a/libstratosphere/source/pwm/driver/board/nintendo/nx/pwm_driver_api.cpp
+++ b/libstratosphere/source/pwm/driver/board/nintendo/nx/pwm_driver_api.cpp
@@ -16,7 +16,7 @@
 #include <stratosphere.hpp>
 #include "impl/pwm_impl_pwm_driver_api.hpp"
 
-namespace ams::pwm::driver::board::nintendo_nx {
+namespace ams::pwm::driver::board::nintendo::nx {
 
     void Initialize() {
         R_ABORT_UNLESS(impl::InitializePwmDriver());