diff --git a/src/Makefile.am b/src/Makefile.am
index 35aa6186a0501bd55caa6ba131bb071b84fef951..67f7cb31ecf51f5867aa545dc0474ef8c955e137 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ noinst_PROGRAMS = \
 test_gradient_method_SOURCES = \
 	test-gradient-method.cc \
 	mynonlinearity.cc \
-	properscalarincreasingconvexfunction.hh \
+	finitescalarincreasingconvexfunction.hh \
 	samplefunctional.hh
 
 check-am:
diff --git a/src/properscalarincreasingconvexfunction.hh b/src/finitescalarincreasingconvexfunction.hh
similarity index 71%
rename from src/properscalarincreasingconvexfunction.hh
rename to src/finitescalarincreasingconvexfunction.hh
index 6499f7b2f83498f9a5844cd42c68a32125e96f7e..a90cc0ac0334171e84e2a15e953b4cbe2904506a 100644
--- a/src/properscalarincreasingconvexfunction.hh
+++ b/src/finitescalarincreasingconvexfunction.hh
@@ -1,17 +1,17 @@
 /* -*- mode:c++; mode:semantic -*- */
 
-#ifndef PROPER_SCALAR_INCREASING_CONVEX_FUNCTION_HH
-#define PROPER_SCALAR_INCREASING_CONVEX_FUNCTION_HH
+#ifndef FINITE_SCALAR_INCREASING_CONVEX_FUNCTION_HH
+#define FINITE_SCALAR_INCREASING_CONVEX_FUNCTION_HH
 
 namespace Dune {
-class ProperScalarIncreasingConvexFunction {
+class FiniteScalarIncreasingConvexFunction {
 public:
   virtual double operator()(const double s) const = 0;
   virtual double leftDifferential(const double s) const = 0;
   virtual double rightDifferential(const double s) const = 0;
 };
 
-class SampleFunction : public ProperScalarIncreasingConvexFunction {
+class SampleFunction : public FiniteScalarIncreasingConvexFunction {
 public:
   double operator()(const double s) const { return (s < 1) ? s : (2 * s - 1); }
 
@@ -20,7 +20,7 @@ class SampleFunction : public ProperScalarIncreasingConvexFunction {
   double rightDifferential(const double s) const { return (s < 1) ? 1 : 2; }
 };
 
-class TrivialFunction : public ProperScalarIncreasingConvexFunction {
+class TrivialFunction : public FiniteScalarIncreasingConvexFunction {
 public:
   double operator()(const double) const { return 0; }
 
diff --git a/src/mynonlinearity.cc b/src/mynonlinearity.cc
index 0b6489bafaddf2c0d33b69c7f079b1a7e0b92c7b..b114da2db62d4ee4838f59c5108c484eeda44db0 100644
--- a/src/mynonlinearity.cc
+++ b/src/mynonlinearity.cc
@@ -11,7 +11,7 @@
 
 #include <limits>
 
-#include "properscalarincreasingconvexfunction.hh"
+#include "finitescalarincreasingconvexfunction.hh"
 
 namespace Dune {
 template <int dimension, class OuterFunction = Dune::TrivialFunction>
diff --git a/src/samplefunctional.hh b/src/samplefunctional.hh
index 211ebf71d257c5bc1f895cc86cad4c98fbbd9599..6f7033f9685dcef42e8507076cb0c27f5372838d 100644
--- a/src/samplefunctional.hh
+++ b/src/samplefunctional.hh
@@ -11,7 +11,7 @@
 #include <dune/tnnmg/problem-classes/directionalconvexfunction.hh>
 
 #include "mynonlinearity.cc"
-#include "properscalarincreasingconvexfunction.hh"
+#include "finitescalarincreasingconvexfunction.hh"
 
 namespace Dune {
 template <int dimension, class Function = TrivialFunction>