diff --git a/src/ZoneLoading/Loading/Exception/InvalidFileNameException.cpp b/src/ZoneLoading/Loading/Exception/InvalidFileNameException.cpp
index b4ec34f6..ae5a50f8 100644
--- a/src/ZoneLoading/Loading/Exception/InvalidFileNameException.cpp
+++ b/src/ZoneLoading/Loading/Exception/InvalidFileNameException.cpp
@@ -1,6 +1,8 @@
 #include "InvalidFileNameException.h"
 
-InvalidFileNameException::InvalidFileNameException(std::string& actualFileName, std::string& expectedFileName)
+#include <format>
+
+InvalidFileNameException::InvalidFileNameException(const std::string& actualFileName, const std::string& expectedFileName)
 {
     m_actual_file_name = actualFileName;
     m_expected_file_name = expectedFileName;
@@ -8,7 +10,7 @@ InvalidFileNameException::InvalidFileNameException(std::string& actualFileName,
 
 std::string InvalidFileNameException::DetailedMessage()
 {
-    return "Name verification failed: The fastfile was created as '" + m_expected_file_name + "' but loaded as '" + m_actual_file_name + "'";
+    return std::format("Name verification failed: The fastfile was created as '{}' but loaded as '{}'", m_expected_file_name, m_actual_file_name);
 }
 
 char const* InvalidFileNameException::what() const noexcept
diff --git a/src/ZoneLoading/Loading/Exception/InvalidFileNameException.h b/src/ZoneLoading/Loading/Exception/InvalidFileNameException.h
index 89c51f24..62761c6b 100644
--- a/src/ZoneLoading/Loading/Exception/InvalidFileNameException.h
+++ b/src/ZoneLoading/Loading/Exception/InvalidFileNameException.h
@@ -3,12 +3,12 @@
 
 class InvalidFileNameException final : public LoadingException
 {
-    std::string m_actual_file_name;
-    std::string m_expected_file_name;
-
 public:
-    InvalidFileNameException(std::string& actualFileName, std::string& expectedFileName);
+    InvalidFileNameException(const std::string& actualFileName, const std::string& expectedFileName);
 
     std::string DetailedMessage() override;
     char const* what() const noexcept override;
+
+    std::string m_actual_file_name;
+    std::string m_expected_file_name;
 };
diff --git a/src/ZoneLoading/Loading/Steps/StepVerifyFileName.cpp b/src/ZoneLoading/Loading/Steps/StepVerifyFileName.cpp
index eeeaa886..d1ab39c0 100644
--- a/src/ZoneLoading/Loading/Steps/StepVerifyFileName.cpp
+++ b/src/ZoneLoading/Loading/Steps/StepVerifyFileName.cpp
@@ -5,12 +5,11 @@
 #include <sstream>
 
 StepVerifyFileName::StepVerifyFileName(std::string fileName, const size_t fileNameBufferSize)
+    : m_expected_file_name(std::move(fileName)),
+      m_file_name_buffer_size(fileNameBufferSize)
 {
-    m_file_name = std::move(fileName);
-    m_file_name_buffer_size = fileNameBufferSize;
-
-    if (m_file_name.length() > m_file_name_buffer_size)
-        m_file_name.erase(m_file_name_buffer_size);
+    if (m_expected_file_name.length() > (m_file_name_buffer_size - 1))
+        m_expected_file_name.erase(m_file_name_buffer_size - 1);
 }
 
 void StepVerifyFileName::PerformStep(ZoneLoader* zoneLoader, ILoadingStream* stream)
@@ -42,6 +41,6 @@ void StepVerifyFileName::PerformStep(ZoneLoader* zoneLoader, ILoadingStream* str
 
     std::string originalFileName = originalFilenameStream.str();
 
-    if (originalFileName != m_file_name)
-        throw InvalidFileNameException(m_file_name, originalFileName);
+    if (originalFileName != m_expected_file_name)
+        throw InvalidFileNameException(m_expected_file_name, originalFileName);
 }
diff --git a/src/ZoneLoading/Loading/Steps/StepVerifyFileName.h b/src/ZoneLoading/Loading/Steps/StepVerifyFileName.h
index 4f021ec8..542d08e2 100644
--- a/src/ZoneLoading/Loading/Steps/StepVerifyFileName.h
+++ b/src/ZoneLoading/Loading/Steps/StepVerifyFileName.h
@@ -4,7 +4,7 @@
 
 class StepVerifyFileName final : public ILoadingStep
 {
-    std::string m_file_name;
+    std::string m_expected_file_name;
     size_t m_file_name_buffer_size;
 
 public: