diff --git a/volatility3/cli/__init__.py b/volatility3/cli/__init__.py
index c0eed20ee..9873791e3 100644
--- a/volatility3/cli/__init__.py
+++ b/volatility3/cli/__init__.py
@@ -790,8 +790,8 @@ class CommandLine:
                     return None
 
                 self._file.close()
-                output_filename = self._get_final_filename()
-                os.rename(self._name, output_filename)
+                self._output_filename = self._get_final_filename()
+                os.rename(self._name, self._output_filename)
 
         if direct:
             return CLIDirectFileHandler
diff --git a/volatility3/framework/plugins/layerwriter.py b/volatility3/framework/plugins/layerwriter.py
index 178d86ba9..20d10d636 100644
--- a/volatility3/framework/plugins/layerwriter.py
+++ b/volatility3/framework/plugins/layerwriter.py
@@ -119,6 +119,7 @@ class LayerWriter(plugins.PluginInterface):
                             progress_callback=self._progress_callback,
                         )
                         file_handle.close()
+                        output_name = file_handle._output_filename
                     except IOError as excp:
                         yield 0, (f"Layer cannot be written to {output_name}: {excp}",)