diff --git a/src/dds_manager.cpp b/src/dds_manager.cpp
index 4369b94..25c52d2 100644
--- a/src/dds_manager.cpp
+++ b/src/dds_manager.cpp
@@ -212,14 +212,14 @@ bool DDSManager::joinDomain(const int& domainID, const std::string& config, std:
     m_config = config;
 
     // If the user set the path to the DDS config file, use it
-    std::string dds_config_file_str = pi::GetEnvVar("DDS_CONFIG_FILE");
+    std::string dds_config_file_str = OpenDDW::GetEnvVar("DDS_CONFIG_FILE");
     if (dds_config_file_str.empty())
     {
         // Use the current directory of the executable as the default
-        auto ddsConfigPath = pi::GetExecutableDirectory();
+        auto ddsConfigPath = OpenDDW::GetExecutableDirectory();
         ddsConfigPath /= "opendds.ini";
         if (!std::filesystem::exists(ddsConfigPath)) {
-            ddsConfigPath = pi::GetExecutableDirectory();
+            ddsConfigPath = OpenDDW::GetExecutableDirectory();
             ddsConfigPath /= "..";
             ddsConfigPath /= "opendds.ini";
         }
@@ -268,7 +268,7 @@ bool DDSManager::joinDomain(const int& domainID, const std::string& config, std:
     };
 
     // Force using the specified NIC
-    ddsIP = pi::GetEnvVar("DDS_IP");
+    ddsIP = OpenDDW::GetEnvVar("DDS_IP");
     if (ddsIP.empty())
     {
         m_messageHandler(LogMessageType::DDS_INFO, "The 'DDS_IP' environment variable was not set.  Using default NIC for DDS.");
diff --git a/src/platformIndependent.h b/src/platformIndependent.h
index 3f4c347..2578eda 100644
--- a/src/platformIndependent.h
+++ b/src/platformIndependent.h
@@ -7,7 +7,7 @@
 #include <mach-o/dyld.h>
 #endif
 
-namespace pi
+namespace OpenDDW
 {
     /// Returns the full path to the executable currently running.
     inline std::filesystem::path GetExecutablePath()