diff --git a/dump-extensions/openpower-dumps/dump_manager_resource.cpp b/dump-extensions/openpower-dumps/dump_manager_resource.cpp
index 76580ee..50c7f59 100644
--- a/dump-extensions/openpower-dumps/dump_manager_resource.cpp
+++ b/dump-extensions/openpower-dumps/dump_manager_resource.cpp
@@ -46,7 +46,7 @@
     // Get the id
     auto id = lastEntryId + 1;
     auto idString = std::to_string(id);
-    auto objPath = fs::path(baseEntryPath) / idString;
+    auto objPath = std::filesystem::path(baseEntryPath) / idString;
 
     try
     {
@@ -89,7 +89,7 @@
 
     auto id = lastEntryId + 1;
     auto idString = std::to_string(id);
-    auto objPath = fs::path(baseEntryPath) / idString;
+    auto objPath = std::filesystem::path(baseEntryPath) / idString;
     std::time_t timeStamp = std::time(nullptr);
 
     std::string vspString = params[sdbusplus::com::ibm::Dump::server::Create::
diff --git a/dump-extensions/openpower-dumps/dump_manager_system.cpp b/dump-extensions/openpower-dumps/dump_manager_system.cpp
index d7b73a9..4652261 100644
--- a/dump-extensions/openpower-dumps/dump_manager_system.cpp
+++ b/dump-extensions/openpower-dumps/dump_manager_system.cpp
@@ -45,7 +45,7 @@
     // Get the id
     auto id = lastEntryId + 1;
     auto idString = std::to_string(id);
-    auto objPath = fs::path(baseEntryPath) / idString;
+    auto objPath = std::filesystem::path(baseEntryPath) / idString;
 
     try
     {
@@ -102,7 +102,7 @@
 
     auto id = lastEntryId + 1;
     auto idString = std::to_string(id);
-    auto objPath = fs::path(baseEntryPath) / idString;
+    auto objPath = std::filesystem::path(baseEntryPath) / idString;
     std::time_t timeStamp = std::time(nullptr);
 
     try
diff --git a/dump-extensions/openpower-dumps/resource_dump_entry.hpp b/dump-extensions/openpower-dumps/resource_dump_entry.hpp
index 3e099a9..c68d90a 100644
--- a/dump-extensions/openpower-dumps/resource_dump_entry.hpp
+++ b/dump-extensions/openpower-dumps/resource_dump_entry.hpp
@@ -19,8 +19,6 @@
 using EntryIfaces = sdbusplus::server::object::object<
     sdbusplus::com::ibm::Dump::Entry::server::Resource>;
 
-namespace fs = std::experimental::filesystem;
-
 class Manager;
 
 /** @class Entry
diff --git a/dump-extensions/openpower-dumps/system_dump_entry.hpp b/dump-extensions/openpower-dumps/system_dump_entry.hpp
index 821be37..7cf07c6 100644
--- a/dump-extensions/openpower-dumps/system_dump_entry.hpp
+++ b/dump-extensions/openpower-dumps/system_dump_entry.hpp
@@ -18,8 +18,6 @@
 using EntryIfaces = sdbusplus::server::object::object<
     sdbusplus::xyz::openbmc_project::Dump::Entry::server::System>;
 
-namespace fs = std::experimental::filesystem;
-
 class Manager;
 
 /** @class Entry