diff --git a/ProcessLib/GroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlowProcess.h
index cbde680fa8e0c8772637edcaafb69973cf556615..be13d4103cfc1fe37e2542b3ec1bff04627dffa3 100644
--- a/ProcessLib/GroundwaterFlowProcess.h
+++ b/ProcessLib/GroundwaterFlowProcess.h
@@ -33,8 +33,8 @@
 
 #include "UniformDirichletBoundaryCondition.h"
 #include "GroundwaterFlowFEM.h"
-#include "NeumannBCAssembler.h"
-#include "NeumannBC.h"
+#include "NeumannBcAssembler.h"
+#include "NeumannBc.h"
 #include "ProcessVariable.h"
 
 namespace ProcessLib
@@ -147,7 +147,7 @@ public:
 
             // Create a neumann BC for the hydraulic head storing them in the
             // _neumann_bcs vector.
-            _hydraulic_head->createNeumannBCs(
+            _hydraulic_head->createNeumannBcs(
                     std::back_inserter(_neumann_bcs),
                     hydraulic_head_mesh_element_searcher,
                     _global_setup,
@@ -239,7 +239,7 @@ private:
         std::vector<double> values;
     } _dirichlet_bc;
 
-    std::vector<NeumannBC<GlobalSetup>*> _neumann_bcs;
+    std::vector<NeumannBc<GlobalSetup>*> _neumann_bcs;
 
     MeshLib::NodeAdjacencyTable _node_adjacency_table;
 };
diff --git a/ProcessLib/NeumannBC.h b/ProcessLib/NeumannBc.h
similarity index 98%
rename from ProcessLib/NeumannBC.h
rename to ProcessLib/NeumannBc.h
index 62644cdc088674707f30e933deb0f636d17756a4..5797f3cb4f9b848cbcdcaf584a9726fd2d791b70 100644
--- a/ProcessLib/NeumannBC.h
+++ b/ProcessLib/NeumannBc.h
@@ -23,17 +23,17 @@
 #include "MeshLib/MeshSubset.h"
 
 #include "NeumannBcConfig.h"
-#include "NeumannBCAssembler.h"
+#include "NeumannBcAssembler.h"
 #include "MeshLib/MeshSearcher.h"
 
 namespace ProcessLib
 {
 
 template <typename GlobalSetup_>
-class NeumannBC
+class NeumannBc
 {
 public:
-    NeumannBC(
+    NeumannBc(
         NeumannBcConfig* bc,
         unsigned const integration_order,
         double const scaling_value,
@@ -61,7 +61,7 @@ public:
                 _all_mesh_subsets, _elements));
     }
 
-    ~NeumannBC()
+    ~NeumannBc()
     {
         for (auto e : _elements)
             delete e;
diff --git a/ProcessLib/NeumannBCAssembler.h b/ProcessLib/NeumannBcAssembler.h
similarity index 100%
rename from ProcessLib/NeumannBCAssembler.h
rename to ProcessLib/NeumannBcAssembler.h
diff --git a/ProcessLib/ProcessVariable.h b/ProcessLib/ProcessVariable.h
index b2ed8080d7324e8de89793cd020e339dad0e2aef..e34220e5fbf4cc896b9d18c0d4bc58a2bfcc6f18 100644
--- a/ProcessLib/ProcessVariable.h
+++ b/ProcessLib/ProcessVariable.h
@@ -19,7 +19,7 @@
 #include "MeshGeoToolsLib/BoundaryElementsSearcher.h"
 
 #include "NeumannBcConfig.h"
-#include "NeumannBC.h"
+#include "NeumannBc.h"
 
 namespace ProcessLib
 {
@@ -50,7 +50,7 @@ public:
             std::vector<std::size_t>& global_ids, std::vector<double>& values);
 
     template <typename OutputIterator, typename GlobalSetup, typename ...Args>
-    void createNeumannBCs(OutputIterator bcs,
+    void createNeumannBcs(OutputIterator bcs,
         MeshGeoToolsLib::BoundaryElementsSearcher& searcher,
         GlobalSetup const& global_setup,
         Args&&... args)
@@ -58,7 +58,7 @@ public:
         for (NeumannBcConfig* config : _neumann_bc_configs)
         {
             config->initialize(searcher);
-            bcs = new NeumannBC<GlobalSetup>(config, std::forward<Args>(args)...);
+            bcs = new NeumannBc<GlobalSetup>(config, std::forward<Args>(args)...);
         }
     }