diff --git a/dune/gfe/harmonicenergy.hh b/dune/gfe/harmonicenergy.hh
index d4558d219c87e747062cc1fb8f69315ecba5c20c..457e32919cb9482a20a7452a212ad488c38f72fd 100644
--- a/dune/gfe/harmonicenergy.hh
+++ b/dune/gfe/harmonicenergy.hh
@@ -7,7 +7,7 @@
 #include <dune/gfe/localenergy.hh>
 
 template<class Basis, class LocalInterpolationRule, class TargetSpace>
-class HarmonicEnergyLocalStiffness
+class HarmonicEnergy
     : public Dune::GFE::LocalEnergy<Basis,TargetSpace>
 {
     // grid types
@@ -27,8 +27,8 @@ public:
 };
 
 template <class Basis, class LocalInterpolationRule, class TargetSpace>
-typename HarmonicEnergyLocalStiffness<Basis, LocalInterpolationRule, TargetSpace>::RT
-HarmonicEnergyLocalStiffness<Basis, LocalInterpolationRule, TargetSpace>::
+typename HarmonicEnergy<Basis, LocalInterpolationRule, TargetSpace>::RT
+HarmonicEnergy<Basis, LocalInterpolationRule, TargetSpace>::
 energy(const typename Basis::LocalView& localView,
        const std::vector<TargetSpace>& localSolution) const
 {
diff --git a/src/gradient-flow.cc b/src/gradient-flow.cc
index 133390bf5c12550d3719fba21ca443cb9dbdd1ae..e9c32fb13b43737564321e46db8845c226dfe9df 100644
--- a/src/gradient-flow.cc
+++ b/src/gradient-flow.cc
@@ -203,7 +203,7 @@ int main (int argc, char *argv[]) try
 
   std::vector<std::shared_ptr<GFE::LocalEnergy<FEBasis,ATargetSpace> > > addends(2);
   using GeodesicInterpolationRule  = LocalGeodesicFEFunction<dim, double, FEBasis::LocalView::Tree::FiniteElement, ATargetSpace>;
-  addends[0] = std::make_shared<HarmonicEnergyLocalStiffness<FEBasis, GeodesicInterpolationRule, ATargetSpace> >();
+  addends[0] = std::make_shared<HarmonicEnergy<FEBasis, GeodesicInterpolationRule, ATargetSpace> >();
   addends[1] = l2DistanceSquaredEnergy;
 
   std::vector<double> weights = {1.0, 1.0/(2*timeStepSize)};
diff --git a/src/harmonicmaps.cc b/src/harmonicmaps.cc
index 132ec020ff9e9723cec7d0c4185a6b1aa958289e..e8c84d8be0c97181fd0d8d3fa97c4853673fb7ea 100644
--- a/src/harmonicmaps.cc
+++ b/src/harmonicmaps.cc
@@ -278,9 +278,9 @@ int main (int argc, char *argv[])
     if (energy == "harmonic")
     {
         if (parameterSet["interpolationMethod"] == "geodesic")
-            localEnergy.reset(new HarmonicEnergyLocalStiffness<FEBasis, GeodesicInterpolationRule, ATargetSpace>);
+            localEnergy.reset(new HarmonicEnergy<FEBasis, GeodesicInterpolationRule, ATargetSpace>);
         else if (parameterSet["interpolationMethod"] == "projected")
-            localEnergy.reset(new HarmonicEnergyLocalStiffness<FEBasis, ProjectedInterpolationRule, ATargetSpace>);
+            localEnergy.reset(new HarmonicEnergy<FEBasis, ProjectedInterpolationRule, ATargetSpace>);
         else
             DUNE_THROW(Exception, "Unknown interpolation method " << parameterSet["interpolationMethod"] << " requested!");