diff --git a/src/xenia/kernel/xam/app_manager.cc b/src/xenia/kernel/xam/app_manager.cc
index fc18ca729..a8c5a9501 100644
--- a/src/xenia/kernel/xam/app_manager.cc
+++ b/src/xenia/kernel/xam/app_manager.cc
@@ -2,7 +2,7 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Copyright 2020 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
@@ -10,7 +10,7 @@
 #include "xenia/kernel/xam/app_manager.h"
 
 #include "xenia/kernel/kernel_state.h"
-#include "xenia/kernel/xam/apps/unknown_fe_app.h"
+#include "xenia/kernel/xam/apps/xam_app.h"
 #include "xenia/kernel/xam/apps/xgi_app.h"
 #include "xenia/kernel/xam/apps/xlivebase_app.h"
 #include "xenia/kernel/xam/apps/xmp_app.h"
@@ -28,7 +28,7 @@ void AppManager::RegisterApps(KernelState* kernel_state, AppManager* manager) {
   manager->RegisterApp(std::make_unique<apps::XmpApp>(kernel_state));
   manager->RegisterApp(std::make_unique<apps::XgiApp>(kernel_state));
   manager->RegisterApp(std::make_unique<apps::XLiveBaseApp>(kernel_state));
-  manager->RegisterApp(std::make_unique<apps::UnknownFEApp>(kernel_state));
+  manager->RegisterApp(std::make_unique<apps::XamApp>(kernel_state));
 }
 
 void AppManager::RegisterApp(std::unique_ptr<App> app) {
diff --git a/src/xenia/kernel/xam/apps/unknown_fe_app.cc b/src/xenia/kernel/xam/apps/xam_app.cc
similarity index 72%
rename from src/xenia/kernel/xam/apps/unknown_fe_app.cc
rename to src/xenia/kernel/xam/apps/xam_app.cc
index a9942cc5b..975c8e42e 100644
--- a/src/xenia/kernel/xam/apps/unknown_fe_app.cc
+++ b/src/xenia/kernel/xam/apps/xam_app.cc
@@ -2,12 +2,12 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2015 Ben Vanik. All rights reserved.                             *
+ * Copyright 2020 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
 
-#include "xenia/kernel/xam/apps/unknown_fe_app.h"
+#include "xenia/kernel/xam/apps/xam_app.h"
 
 #include "xenia/base/logging.h"
 #include "xenia/base/threading.h"
@@ -17,12 +17,10 @@ namespace kernel {
 namespace xam {
 namespace apps {
 
-UnknownFEApp::UnknownFEApp(KernelState* kernel_state)
-    : App(kernel_state, 0xFE) {}
+XamApp::XamApp(KernelState* kernel_state) : App(kernel_state, 0xFE) {}
 
-X_RESULT UnknownFEApp::DispatchMessageSync(uint32_t message,
-                                           uint32_t buffer_ptr,
-                                           uint32_t buffer_length) {
+X_RESULT XamApp::DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
+                                     uint32_t buffer_length) {
   // NOTE: buffer_length may be zero or valid.
   auto buffer = memory_->TranslateVirtual(buffer_ptr);
   switch (message) {
@@ -36,13 +34,13 @@ X_RESULT UnknownFEApp::DispatchMessageSync(uint32_t message,
       assert_true(buffer_length == sizeof(message_data));
       auto unk = memory_->TranslateVirtual<xe::be<uint32_t>*>(data->unk_44);
       *unk = 0;
-      XELOGD("UnknownFEApp(0x00020021)('{}', {:08X}, {:08X}, {:08X})",
-             data->unk_00, (uint32_t)data->unk_40, (uint32_t)data->unk_44,
+      XELOGD("XamApp(0x00020021)('{}', {:08X}, {:08X}, {:08X})", data->unk_00,
+             (uint32_t)data->unk_40, (uint32_t)data->unk_44,
              (uint32_t)data->unk_48);
       return X_ERROR_SUCCESS;
     }
     case 0x00021012: {
-      XELOGD("UnknownFEApp(0x00021012)");
+      XELOGD("XamApp(0x00021012)");
       return X_ERROR_SUCCESS;
     }
     case 0x00022005: {
@@ -53,13 +51,13 @@ X_RESULT UnknownFEApp::DispatchMessageSync(uint32_t message,
       assert_true(buffer_length == sizeof(message_data));
       auto unk = memory_->TranslateVirtual<xe::be<uint32_t>*>(data->unk_00);
       auto adr = *unk;
-      XELOGD("UnknownFEApp(0x00022005)(%.8X, %.8X)", (uint32_t)data->unk_00,
+      XELOGD("XamApp(0x00022005)(%.8X, %.8X)", (uint32_t)data->unk_00,
              (uint32_t)data->unk_04);
       return X_ERROR_SUCCESS;
     }
   }
   XELOGE(
-      "Unimplemented 0xFE message app={:08X}, msg={:08X}, arg1={:08X}, "
+      "Unimplemented XAM message app={:08X}, msg={:08X}, arg1={:08X}, "
       "arg2={:08X}",
       app_id(), message, buffer_ptr, buffer_length);
   return X_STATUS_UNSUCCESSFUL;
diff --git a/src/xenia/kernel/xam/apps/unknown_fe_app.h b/src/xenia/kernel/xam/apps/xam_app.h
similarity index 73%
rename from src/xenia/kernel/xam/apps/unknown_fe_app.h
rename to src/xenia/kernel/xam/apps/xam_app.h
index f2d764f17..6e653f384 100644
--- a/src/xenia/kernel/xam/apps/unknown_fe_app.h
+++ b/src/xenia/kernel/xam/apps/xam_app.h
@@ -2,13 +2,13 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2015 Ben Vanik. All rights reserved.                             *
+ * Copyright 2020 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
 
-#ifndef XENIA_KERNEL_XAM_APPS_UNKNOWN_FE_APP_H_
-#define XENIA_KERNEL_XAM_APPS_UNKNOWN_FE_APP_H_
+#ifndef XENIA_KERNEL_XAM_APPS_XAM_APP_H_
+#define XENIA_KERNEL_XAM_APPS_XAM_APP_H_
 
 #include "xenia/kernel/kernel_state.h"
 #include "xenia/kernel/xam/app_manager.h"
@@ -18,9 +18,9 @@ namespace kernel {
 namespace xam {
 namespace apps {
 
-class UnknownFEApp : public App {
+class XamApp : public App {
  public:
-  explicit UnknownFEApp(KernelState* kernel_state);
+  explicit XamApp(KernelState* kernel_state);
 
   X_RESULT DispatchMessageSync(uint32_t message, uint32_t buffer_ptr,
                                uint32_t buffer_length) override;
@@ -31,4 +31,4 @@ class UnknownFEApp : public App {
 }  // namespace kernel
 }  // namespace xe
 
-#endif  // XENIA_KERNEL_XAM_APPS_UNKNOWN_FE_APP_H_
+#endif  // XENIA_KERNEL_XAM_APPS_XAM_APP_H_