diff --git a/opm/autodiff/FlowMainEbos.hpp b/opm/autodiff/FlowMainEbos.hpp
index 1d3368c7e..bb73c18d0 100755
--- a/opm/autodiff/FlowMainEbos.hpp
+++ b/opm/autodiff/FlowMainEbos.hpp
@@ -273,7 +273,7 @@ namespace Opm
 
             const std::string& output_dir = eclState().getIOConfig().getOutputDir();
             logFileStream << output_dir << "/" << baseName;
-            debugFileStream << output_dir << "/" << "." << baseName;
+            debugFileStream << output_dir << "/" << baseName;
 
             if ( must_distribute_ && mpi_rank_ != 0 )
             {
@@ -284,7 +284,7 @@ namespace Opm
                 logFileStream << "." << mpi_rank_;
             }
             logFileStream << ".PRT";
-            debugFileStream << ".DEBUG";
+            debugFileStream << ".DBG";
 
             logFile_ = logFileStream.str();
 
diff --git a/opm/simulators/ParallelFileMerger.hpp b/opm/simulators/ParallelFileMerger.hpp
index df11256e4..d66094792 100644
--- a/opm/simulators/ParallelFileMerger.hpp
+++ b/opm/simulators/ParallelFileMerger.hpp
@@ -49,11 +49,11 @@ public:
     /// \param deckanme The name of the deck.
     ParallelFileMerger(const fs::path& output_dir,
                        const std::string& deckname)
-        : debugFileRegex_("\\."+deckname+"\\.\\d+\\.DEBUG"),
+        : debugFileRegex_(deckname+"\\.\\d+\\.DBG"),
           logFileRegex_(deckname+"\\.\\d+\\.PRT")
     {
         auto debugPath = output_dir;
-        debugPath /= (std::string(".") + deckname + ".DEBUG");
+        debugPath /= (deckname + ".DBG");
         debugStream_.reset(new fs::ofstream(debugPath,
                                             std::ofstream::app));
         auto logPath = output_dir;
@@ -119,11 +119,11 @@ private:
         fs::remove(file);
     }
 
-    /// \brief Regex to capture .*.DEBUG
+    /// \brief Regex to capture *.DBG
     boost::regex debugFileRegex_;
     /// \brief Regex to capture  *.PRT
     boost::regex logFileRegex_;
-    /// \brief Stream to *.DEBUG file
+    /// \brief Stream to *.DBG file
     std::unique_ptr<fs::ofstream> debugStream_;
     /// \brief Stream to *.PRT file
     std::unique_ptr<fs::ofstream> logStream_;