diff --git a/src/xenia/kernel/fs/device.cc b/src/xenia/kernel/fs/device.cc
index d658ab0e6..8bcbbc091 100644
--- a/src/xenia/kernel/fs/device.cc
+++ b/src/xenia/kernel/fs/device.cc
@@ -20,7 +20,7 @@ Device::Device(const std::string& path) : path_(path) {}
 Device::~Device() = default;
 
 // TODO(gibbed): call into HostPathDevice?
-X_STATUS Device::QueryVolume(XVolumeInfo* out_info, size_t length) {
+X_STATUS Device::QueryVolume(X_FILE_FS_VOLUME_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 e08b59a67..6d4eaea94 100644
--- a/src/xenia/kernel/fs/device.h
+++ b/src/xenia/kernel/fs/device.h
@@ -30,7 +30,7 @@ class Device {
 
   virtual std::unique_ptr<Entry> ResolvePath(const char* path) = 0;
 
-  virtual X_STATUS QueryVolume(XVolumeInfo* out_info, size_t length);
+  virtual X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length);
   virtual X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
                                              size_t length);
 
diff --git a/src/xenia/kernel/fs/devices/disc_image_file.cc b/src/xenia/kernel/fs/devices/disc_image_file.cc
index 158bf14ff..3208ca741 100644
--- a/src/xenia/kernel/fs/devices/disc_image_file.cc
+++ b/src/xenia/kernel/fs/devices/disc_image_file.cc
@@ -40,7 +40,7 @@ X_STATUS DiscImageFile::QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, s
   return entry_->QueryDirectory(out_info, length, file_name, restart);
 }
 
-X_STATUS DiscImageFile::QueryVolume(XVolumeInfo* out_info, size_t length) {
+X_STATUS DiscImageFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) {
   return entry_->device()->QueryVolume(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 510f6f8e1..ed8385d9d 100644
--- a/src/xenia/kernel/fs/devices/disc_image_file.h
+++ b/src/xenia/kernel/fs/devices/disc_image_file.h
@@ -32,7 +32,7 @@ class DiscImageFile : public XFile {
   X_STATUS QueryInfo(X_FILE_NETWORK_OPEN_INFORMATION* out_info) override;
   X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
                           const char* file_name, bool restart) override;
-  X_STATUS QueryVolume(XVolumeInfo* out_info, size_t length) override;
+  X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
   X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
                                      size_t length) override;
 
diff --git a/src/xenia/kernel/fs/devices/host_path_file.cc b/src/xenia/kernel/fs/devices/host_path_file.cc
index c88249c92..abd66861c 100644
--- a/src/xenia/kernel/fs/devices/host_path_file.cc
+++ b/src/xenia/kernel/fs/devices/host_path_file.cc
@@ -40,7 +40,7 @@ X_STATUS HostPathFile::QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, si
   return entry_->QueryDirectory(out_info, length, file_name, restart);
 }
 
-X_STATUS HostPathFile::QueryVolume(XVolumeInfo* out_info, size_t length) {
+X_STATUS HostPathFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) {
   return entry_->device()->QueryVolume(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 998af33b4..aa5be7c58 100644
--- a/src/xenia/kernel/fs/devices/host_path_file.h
+++ b/src/xenia/kernel/fs/devices/host_path_file.h
@@ -34,7 +34,7 @@ class HostPathFile : public XFile {
   X_STATUS QueryInfo(X_FILE_NETWORK_OPEN_INFORMATION* out_info) override;
   X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
                           const char* file_name, bool restart) override;
-  X_STATUS QueryVolume(XVolumeInfo* out_info, size_t length) override;
+  X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
   X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
                                      size_t length) override;
 
diff --git a/src/xenia/kernel/fs/devices/stfs_container_file.cc b/src/xenia/kernel/fs/devices/stfs_container_file.cc
index b3f5213e9..e624f976e 100644
--- a/src/xenia/kernel/fs/devices/stfs_container_file.cc
+++ b/src/xenia/kernel/fs/devices/stfs_container_file.cc
@@ -41,7 +41,7 @@ X_STATUS STFSContainerFile::QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_inf
   return entry_->QueryDirectory(out_info, length, file_name, restart);
 }
 
-X_STATUS STFSContainerFile::QueryVolume(XVolumeInfo* out_info, size_t length) {
+X_STATUS STFSContainerFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) {
   return entry_->device()->QueryVolume(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 63046dbe0..8364e799c 100644
--- a/src/xenia/kernel/fs/devices/stfs_container_file.h
+++ b/src/xenia/kernel/fs/devices/stfs_container_file.h
@@ -32,7 +32,7 @@ class STFSContainerFile : public XFile {
   X_STATUS QueryInfo(X_FILE_NETWORK_OPEN_INFORMATION* out_info) override;
   X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
                           const char* file_name, bool restart) override;
-  X_STATUS QueryVolume(XVolumeInfo* out_info, size_t length) override;
+  X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
   X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
                                      size_t length) override;
 
diff --git a/src/xenia/kernel/fs/entry.h b/src/xenia/kernel/fs/entry.h
index f95adf659..d9cb2442f 100644
--- a/src/xenia/kernel/fs/entry.h
+++ b/src/xenia/kernel/fs/entry.h
@@ -22,7 +22,7 @@ class XFile;
 class X_FILE_NETWORK_OPEN_INFORMATION;
 class XFileSystemAttributeInfo;
 class X_FILE_DIRECTORY_INFORMATION;
-class XVolumeInfo;
+class X_FILE_FS_VOLUME_INFORMATION;
 }  // namespace kernel
 }  // namespace xe
 
diff --git a/src/xenia/kernel/objects/xfile.h b/src/xenia/kernel/objects/xfile.h
index f6563ef50..3a1264b25 100644
--- a/src/xenia/kernel/objects/xfile.h
+++ b/src/xenia/kernel/objects/xfile.h
@@ -84,8 +84,8 @@ class X_FILE_DIRECTORY_INFORMATION {
 };
 static_assert_size(X_FILE_DIRECTORY_INFORMATION, 72);
 
-// http://msdn.microsoft.com/en-us/library/windows/hardware/ff540287(v=vs.85).aspx
-class XVolumeInfo {
+// http://msdn.microsoft.com/en-us/library/windows/hardware/ff540287.aspx
+class X_FILE_FS_VOLUME_INFORMATION {
  public:
   // FILE_FS_VOLUME_INFORMATION
   uint64_t creation_time;
@@ -103,7 +103,7 @@ class XVolumeInfo {
     memcpy(dst + 20, this->label, this->label_length);
   }
 };
-static_assert_size(XVolumeInfo, 24);
+static_assert_size(X_FILE_FS_VOLUME_INFORMATION, 24);
 
 // https://msdn.microsoft.com/en-us/library/windows/hardware/ff540282(v=vs.85).aspx
 class XFileSystemSizeInfo {
@@ -158,7 +158,7 @@ class XFile : public XObject {
   virtual X_STATUS QueryInfo(X_FILE_NETWORK_OPEN_INFORMATION* out_info) = 0;
   virtual X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
                                   const char* file_name, bool restart) = 0;
-  virtual X_STATUS QueryVolume(XVolumeInfo* out_info, size_t length) = 0;
+  virtual X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) = 0;
   virtual X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info,
                                              size_t length) = 0;
 
diff --git a/src/xenia/kernel/xboxkrnl_io.cc b/src/xenia/kernel/xboxkrnl_io.cc
index 089ac3ed9..05e0aed1a 100644
--- a/src/xenia/kernel/xboxkrnl_io.cc
+++ b/src/xenia/kernel/xboxkrnl_io.cc
@@ -616,7 +616,7 @@ SHIM_CALL NtQueryVolumeInformationFile_shim(PPCContext* ppc_state,
     result = X_STATUS_SUCCESS;
     switch (fs_info_class) {
       case 1: {  // FileFsVolumeInformation
-        auto volume_info = (XVolumeInfo*)calloc(length, 1);
+        auto volume_info = (X_FILE_FS_VOLUME_INFORMATION*)calloc(length, 1);
         result = file->QueryVolume(volume_info, length);
         if (XSUCCEEDED(result)) {
           volume_info->Write(SHIM_MEM_BASE, fs_info_ptr);