diff --git a/source/postprocess/dynamic_topography.cc b/source/postprocess/dynamic_topography.cc
index d6d0a1b2258..1dd1bb9ee9b 100644
--- a/source/postprocess/dynamic_topography.cc
+++ b/source/postprocess/dynamic_topography.cc
@@ -425,7 +425,7 @@ namespace aspect
         {
           output << "# "
                  << ((dim==2)? "x y " : "x y z ")
-                 << " heat_flux_" << boundary_name << std::endl;
+                 << "dynamic_topography_" << boundary_name << std::endl;
         }
 
       for (unsigned int i=0; i<stored_values.size(); ++i)
diff --git a/source/postprocess/heat_flux_map.cc b/source/postprocess/heat_flux_map.cc
index 89cb6338163..7bdea4942a0 100644
--- a/source/postprocess/heat_flux_map.cc
+++ b/source/postprocess/heat_flux_map.cc
@@ -466,7 +466,10 @@ namespace aspect
             this->get_geometry_model().translate_id_to_symbol_name(boundary_id) == "bottom")
           output_to_file(boundary_id, heat_flux_and_area);
 
-      const std::string placeholder_name = this->get_output_directory() + "heat_flux." + Utilities::int_to_string(this->get_timestep_number(), 5);
+      std::string placeholder_name = this->get_output_directory() + "heat_flux." + Utilities::int_to_string(this->get_timestep_number(), 5);
+      if (this->get_parameters().run_postprocessors_on_nonlinear_iterations)
+        placeholder_name.append("." + Utilities::int_to_string (this->get_nonlinear_iteration(), 4));
+
       return std::pair<std::string,std::string>("Writing heat flux map",
                                                 placeholder_name);
     }