diff --git a/src/xenia/kernel/fs/device.cc b/src/xenia/kernel/fs/device.cc
index 8bcbbc091..b3457ad42 100644
--- a/src/xenia/kernel/fs/device.cc
+++ b/src/xenia/kernel/fs/device.cc
@@ -39,7 +39,7 @@ X_STATUS Device::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t leng
 }
 
 // TODO(gibbed): call into HostPathDevice?
-X_STATUS Device::QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
+X_STATUS Device::QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
                                            size_t length) {
   assert_not_null(out_info);
   const char* name = "test";  // TODO(gibbed): actual value
diff --git a/src/xenia/kernel/fs/device.h b/src/xenia/kernel/fs/device.h
index 6d4eaea94..c7554d6fb 100644
--- a/src/xenia/kernel/fs/device.h
+++ b/src/xenia/kernel/fs/device.h
@@ -31,7 +31,7 @@ class Device {
   virtual std::unique_ptr<Entry> ResolvePath(const char* path) = 0;
 
   virtual X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length);
-  virtual X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
+  virtual X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
                                              size_t length);
 
  protected:
diff --git a/src/xenia/kernel/fs/devices/disc_image_file.cc b/src/xenia/kernel/fs/devices/disc_image_file.cc
index 3208ca741..8f6a1359d 100644
--- a/src/xenia/kernel/fs/devices/disc_image_file.cc
+++ b/src/xenia/kernel/fs/devices/disc_image_file.cc
@@ -45,7 +45,7 @@ X_STATUS DiscImageFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size
 }
 
 X_STATUS DiscImageFile::QueryFileSystemAttributes(
-    XFileSystemAttributeInfo* out_info, size_t length) {
+    X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
   return entry_->device()->QueryFileSystemAttributes(out_info, length);
 }
 
diff --git a/src/xenia/kernel/fs/devices/disc_image_file.h b/src/xenia/kernel/fs/devices/disc_image_file.h
index ed8385d9d..8dfe7e8d7 100644
--- a/src/xenia/kernel/fs/devices/disc_image_file.h
+++ b/src/xenia/kernel/fs/devices/disc_image_file.h
@@ -33,7 +33,7 @@ class DiscImageFile : public XFile {
   X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
                           const char* file_name, bool restart) override;
   X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
-  X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
+  X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
                                      size_t length) override;
 
  protected:
diff --git a/src/xenia/kernel/fs/devices/host_path_file.cc b/src/xenia/kernel/fs/devices/host_path_file.cc
index abd66861c..af76751f3 100644
--- a/src/xenia/kernel/fs/devices/host_path_file.cc
+++ b/src/xenia/kernel/fs/devices/host_path_file.cc
@@ -45,7 +45,7 @@ X_STATUS HostPathFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_
 }
 
 X_STATUS HostPathFile::QueryFileSystemAttributes(
-    XFileSystemAttributeInfo* out_info, size_t length) {
+    X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
   return entry_->device()->QueryFileSystemAttributes(out_info, length);
 }
 
diff --git a/src/xenia/kernel/fs/devices/host_path_file.h b/src/xenia/kernel/fs/devices/host_path_file.h
index aa5be7c58..a374628f7 100644
--- a/src/xenia/kernel/fs/devices/host_path_file.h
+++ b/src/xenia/kernel/fs/devices/host_path_file.h
@@ -35,7 +35,7 @@ class HostPathFile : public XFile {
   X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
                           const char* file_name, bool restart) override;
   X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
-  X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
+  X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
                                      size_t length) override;
 
  protected:
diff --git a/src/xenia/kernel/fs/devices/stfs_container_file.cc b/src/xenia/kernel/fs/devices/stfs_container_file.cc
index e624f976e..4e216b37a 100644
--- a/src/xenia/kernel/fs/devices/stfs_container_file.cc
+++ b/src/xenia/kernel/fs/devices/stfs_container_file.cc
@@ -46,7 +46,7 @@ X_STATUS STFSContainerFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info,
 }
 
 X_STATUS STFSContainerFile::QueryFileSystemAttributes(
-    XFileSystemAttributeInfo* out_info, size_t length) {
+    X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
   return entry_->device()->QueryFileSystemAttributes(out_info, length);
 }
 
diff --git a/src/xenia/kernel/fs/devices/stfs_container_file.h b/src/xenia/kernel/fs/devices/stfs_container_file.h
index 8364e799c..3b2c1343c 100644
--- a/src/xenia/kernel/fs/devices/stfs_container_file.h
+++ b/src/xenia/kernel/fs/devices/stfs_container_file.h
@@ -33,7 +33,7 @@ class STFSContainerFile : public XFile {
   X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
                           const char* file_name, bool restart) override;
   X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
-  X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
+  X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
                                      size_t length) override;
 
  protected:
diff --git a/src/xenia/kernel/fs/entry.h b/src/xenia/kernel/fs/entry.h
index d9cb2442f..3067d5197 100644
--- a/src/xenia/kernel/fs/entry.h
+++ b/src/xenia/kernel/fs/entry.h
@@ -20,7 +20,7 @@ namespace kernel {
 class KernelState;
 class XFile;
 class X_FILE_NETWORK_OPEN_INFORMATION;
-class XFileSystemAttributeInfo;
+class X_FILE_FS_ATTRIBUTE_INFORMATION;
 class X_FILE_DIRECTORY_INFORMATION;
 class X_FILE_FS_VOLUME_INFORMATION;
 }  // namespace kernel
diff --git a/src/xenia/kernel/objects/xfile.h b/src/xenia/kernel/objects/xfile.h
index 995cd73c3..87af6c7be 100644
--- a/src/xenia/kernel/objects/xfile.h
+++ b/src/xenia/kernel/objects/xfile.h
@@ -125,7 +125,7 @@ class X_FILE_FS_SIZE_INFORMATION {
 static_assert_size(X_FILE_FS_SIZE_INFORMATION, 24);
 
 // http://msdn.microsoft.com/en-us/library/windows/hardware/ff540251(v=vs.85).aspx
-class XFileSystemAttributeInfo {
+class X_FILE_FS_ATTRIBUTE_INFORMATION {
  public:
   // FILE_FS_ATTRIBUTE_INFORMATION
   uint32_t attributes;
@@ -141,7 +141,7 @@ class XFileSystemAttributeInfo {
     memcpy(dst + 12, this->fs_name, this->fs_name_length);
   }
 };
-static_assert_size(XFileSystemAttributeInfo, 16);
+static_assert_size(X_FILE_FS_ATTRIBUTE_INFORMATION, 16);
 
 class XFile : public XObject {
  public:
@@ -159,7 +159,7 @@ class XFile : public XObject {
   virtual X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
                                   const char* file_name, bool restart) = 0;
   virtual X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) = 0;
-  virtual X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
+  virtual X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
                                              size_t length) = 0;
 
   X_STATUS Read(void* buffer, size_t buffer_length, size_t byte_offset,
diff --git a/src/xenia/kernel/xboxkrnl_io.cc b/src/xenia/kernel/xboxkrnl_io.cc
index 05e0aed1a..af5d7dce2 100644
--- a/src/xenia/kernel/xboxkrnl_io.cc
+++ b/src/xenia/kernel/xboxkrnl_io.cc
@@ -626,7 +626,7 @@ SHIM_CALL NtQueryVolumeInformationFile_shim(PPCContext* ppc_state,
         break;
       }
       case 5: {  // FileFsAttributeInformation
-        auto fs_attribute_info = (XFileSystemAttributeInfo*)calloc(length, 1);
+        auto fs_attribute_info = (X_FILE_FS_ATTRIBUTE_INFORMATION*)calloc(length, 1);
         result = file->QueryFileSystemAttributes(fs_attribute_info, length);
         if (XSUCCEEDED(result)) {
           fs_attribute_info->Write(SHIM_MEM_BASE, fs_info_ptr);