diff --git a/dumux/boxmodels/2p2c/2p2clocalresidual.hh b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
index 21f8baff801aab4adbf275b1b1a17825168e9803..d36494883f10c84618339cde1355aca940c97ba1 100644
--- a/dumux/boxmodels/2p2c/2p2clocalresidual.hh
+++ b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
@@ -23,8 +23,8 @@
  *        using the two-phase two-component box model.
  */
 
-#ifndef DUMUX_NEW_2P2C_LOCAL_RESIDUAL_BASE_HH
-#define DUMUX_NEW_2P2C_LOCAL_RESIDUAL_BASE_HH
+#ifndef DUMUX_2P2C_LOCAL_RESIDUAL_BASE_HH
+#define DUMUX_2P2C_LOCAL_RESIDUAL_BASE_HH
 
 #include <dumux/boxmodels/common/boxmodel.hh>
 #include <dumux/common/math.hh>
@@ -37,8 +37,6 @@
 #include <iostream>
 #include <vector>
 
-//#define VELOCITY_OUTPUT 1 // uncomment this line if an output of the velocity is needed
-
 namespace Dumux
 {
 /*!
diff --git a/dumux/material/components/air.hh b/dumux/material/components/air.hh
index c35c38e4e3af66b7fae21e94b9a4b25dbc62e7f2..23600c5f0302f47f0eed0931847d8e3c4b8bbd37 100644
--- a/dumux/material/components/air.hh
+++ b/dumux/material/components/air.hh
@@ -205,6 +205,6 @@ public:
 
 };
 
-} // end namepace
+} // end namespace
 
 #endif
diff --git a/dumux/material/idealgas.hh b/dumux/material/idealgas.hh
index a2ecd78b4ec407c21764f814957120be713f8f6a..33f134303727deee1d5ca2e6d8e90465734251d2 100644
--- a/dumux/material/idealgas.hh
+++ b/dumux/material/idealgas.hh
@@ -68,6 +68,6 @@ public:
 template <class Scalar>
 const Scalar IdealGas<Scalar>::R = Dumux::Constants<Scalar>::R;
 
-} // end namepace
+} // end namespace
 
 #endif