diff --git a/stratosphere/boot/source/boot_boot_reason.cpp b/stratosphere/boot/source/boot_boot_reason.cpp
index c72e681ec..c42a01e98 100644
--- a/stratosphere/boot/source/boot_boot_reason.cpp
+++ b/stratosphere/boot/source/boot_boot_reason.cpp
@@ -91,7 +91,7 @@ namespace sts::boot {
         g_boot_reason = MakeBootReason(power_intr, rtc_intr & ~rtc_intr_m, nv_erc, ac_ok);
 
         /* Set boot reason for SPL. */
-        if (GetRuntimeFirmwareVersion() >= FirmwareVersion_300) {
+        if (hos::GetVersion() >= hos::Version_300) {
             BootReasonValue boot_reason_value;
             boot_reason_value.power_intr = power_intr;
             boot_reason_value.rtc_intr = rtc_intr & ~rtc_intr_m;
diff --git a/stratosphere/boot/source/boot_clock_initial_configuration.cpp b/stratosphere/boot/source/boot_clock_initial_configuration.cpp
index 8f15d0cd3..b09e83941 100644
--- a/stratosphere/boot/source/boot_clock_initial_configuration.cpp
+++ b/stratosphere/boot/source/boot_clock_initial_configuration.cpp
@@ -31,7 +31,7 @@ namespace sts::boot {
 
     void SetInitialClockConfiguration() {
         /* Write mask to APBDEV_PMC_PWR_DET, then clear APBDEV_PMC_PWR_DET_VAL. */
-        const u32 mask = GetRuntimeFirmwareVersion() >= FirmwareVersion_600 ? InitialClockOutMask6x : InitialClockOutMask1x;
+        const u32 mask = hos::GetVersion() >= hos::Version_600 ? InitialClockOutMask6x : InitialClockOutMask1x;
         WritePmcRegister(PmcClkOutCntrl, mask, mask);
     }
 
diff --git a/stratosphere/boot/source/boot_main.cpp b/stratosphere/boot/source/boot_main.cpp
index dc4898530..a41895e9d 100644
--- a/stratosphere/boot/source/boot_main.cpp
+++ b/stratosphere/boot/source/boot_main.cpp
@@ -85,7 +85,7 @@ void __libnx_initheap(void) {
 }
 
 void __appInit(void) {
-    SetFirmwareVersionForLibnx();
+    hos::SetVersionForLibnx();
 
     /* Initialize services we need (TODO: NCM) */
     DoWithSmSession([&]() {
diff --git a/stratosphere/boot/source/gpio/gpio_initial_configuration.cpp b/stratosphere/boot/source/gpio/gpio_initial_configuration.cpp
index 0f254b995..10c420dc9 100644
--- a/stratosphere/boot/source/gpio/gpio_initial_configuration.cpp
+++ b/stratosphere/boot/source/gpio/gpio_initial_configuration.cpp
@@ -41,14 +41,14 @@ namespace sts::gpio {
         const InitialConfig *configs = nullptr;
         size_t num_configs = 0;
         const auto hw_type = spl::GetHardwareType();
-        const FirmwareVersion fw_ver = GetRuntimeFirmwareVersion();
+        const auto hos_ver = hos::GetVersion();
 
         /* Choose GPIO map. */
-        if (fw_ver >= FirmwareVersion_200) {
+        if (hos_ver >= hos::Version_200) {
             switch (hw_type) {
                 case spl::HardwareType::Icosa:
                     {
-                        if (fw_ver >= FirmwareVersion_400) {
+                        if (hos_ver >= hos::Version_400) {
                             configs = InitialConfigsIcosa4x;
                             num_configs = NumInitialConfigsIcosa4x;
                         } else {