diff --git a/ProcessLib/Output/Output.cpp b/ProcessLib/Output/Output.cpp
index ac19f66c399511cbe1a2267416f77325eb0d06d7..17a958fbb609a6a5e57d2827c872515cf6628303 100644
--- a/ProcessLib/Output/Output.cpp
+++ b/ProcessLib/Output/Output.cpp
@@ -93,8 +93,8 @@ bool Output::shallDoOutput(int timestep, double const t)
     return false;
 }
 
-Output::Output(std::string output_directory, OutputType output_file_type,
-               std::string output_file_prefix, std::string output_file_suffix,
+Output::Output(std::string directory, OutputType file_type,
+               std::string file_prefix, std::string file_suffix,
                bool const compress_output, std::string const& data_mode,
                bool const output_nonlinear_iteration_results,
                std::vector<PairRepeatEachSteps> repeats_each_steps,
@@ -102,10 +102,10 @@ Output::Output(std::string output_directory, OutputType output_file_type,
                OutputDataSpecification&& output_data_specification,
                std::vector<std::string>&& mesh_names_for_output,
                std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes)
-    : _output_directory(std::move(output_directory)),
-      _output_file_type(output_file_type),
-      _output_file_prefix(std::move(output_file_prefix)),
-      _output_file_suffix(std::move(output_file_suffix)),
+    : _output_directory(std::move(directory)),
+      _output_file_type(file_type),
+      _output_file_prefix(std::move(file_prefix)),
+      _output_file_suffix(std::move(file_suffix)),
       _output_file_compression(compress_output),
       _output_file_data_mode(convertVtkDataMode(data_mode)),
       _output_nonlinear_iteration_results(output_nonlinear_iteration_results),
diff --git a/ProcessLib/Output/Output.h b/ProcessLib/Output/Output.h
index 783aed1c4b9970286afda05d5d616b322d3aef14..1cf0709012c3c815e27d423d2771ce6d08444103 100644
--- a/ProcessLib/Output/Output.h
+++ b/ProcessLib/Output/Output.h
@@ -38,7 +38,7 @@ public:
     };
 
 public:
-    Output(std::string output_directory, OutputType const type,
+    Output(std::string directory, OutputType const type,
            std::string prefix, std::string suffix, bool const compress_output,
            std::string const& data_mode,
            bool const output_nonlinear_iteration_results,
diff --git a/ProcessLib/Output/ProcessOutput.cpp b/ProcessLib/Output/ProcessOutput.cpp
index f223937c5c4a62210d645846375faeaf21c82639..d34ed006228cec6ef273e71afd615a2bd64e9bfa 100644
--- a/ProcessLib/Output/ProcessOutput.cpp
+++ b/ProcessLib/Output/ProcessOutput.cpp
@@ -139,7 +139,7 @@ void addProcessDataToMesh(
     const double t, std::vector<GlobalVector*> const& x, int const process_id,
     MeshLib::Mesh& mesh,
     [[maybe_unused]] std::vector<NumLib::LocalToGlobalIndexMap const*> const&
-        bulk_dof_table,
+        bulk_dof_tables,
     std::vector<NumLib::LocalToGlobalIndexMap const*> const& dof_table,
     std::vector<std::reference_wrapper<ProcessVariable>> const&
         process_variables,
@@ -212,7 +212,7 @@ void addProcessDataToMesh(
             for (auto const* node : mesh_subset.getNodes())
             {
 #ifdef USE_PETSC
-                if (bulk_dof_table[process_id] != dof_table[process_id])
+                if (bulk_dof_tables[process_id] != dof_table[process_id])
                 {
                     if (!mesh.getProperties().existsPropertyVector<std::size_t>(
                             "bulk_node_ids"))
@@ -234,7 +234,7 @@ void addProcessDataToMesh(
                     {
                         auto const bulk_node_id =
                             bulk_node_id_map[node->getID()];
-                        // use bulk_dof_table to find information
+                        // use bulk_dof_tables to find information
                         std::size_t const bulk_mesh_id = 0;
                         MeshLib::Location const l(bulk_mesh_id,
                                                   MeshLib::MeshItemType::Node,
@@ -242,7 +242,7 @@ void addProcessDataToMesh(
                         auto const global_component_id =
                             global_component_offset + component_id;
                         auto const index =
-                            bulk_dof_table[process_id]->getLocalIndex(
+                            bulk_dof_tables[process_id]->getLocalIndex(
                                 l, global_component_id,
                                 x[process_id]->getRangeBegin(),
                                 x[process_id]->getRangeEnd());
diff --git a/ProcessLib/Output/ProcessOutput.h b/ProcessLib/Output/ProcessOutput.h
index 07cb8ef6dbf70b9606b3705aebe84987ab2dce20..71541c5877d9e0207017a25138f75abd921bb6b5 100644
--- a/ProcessLib/Output/ProcessOutput.h
+++ b/ProcessLib/Output/ProcessOutput.h
@@ -41,7 +41,7 @@ void addProcessDataToMesh(
     bool const output_secondary_variable,
     std::vector<std::unique_ptr<IntegrationPointWriter>> const*
         integration_point_writer,
-    OutputDataSpecification const& output_data_specification);
+    OutputDataSpecification const& process_output);
 
 //! Writes output to the given \c file_name using the specified file format.
 ///