diff --git a/include/rosa/agent/Abstraction.hpp b/include/rosa/agent/Abstraction.hpp
index 3b72448..c9c4fa2 100644
--- a/include/rosa/agent/Abstraction.hpp
+++ b/include/rosa/agent/Abstraction.hpp
@@ -1,191 +1,191 @@
 //===-- rosa/agent/Abstraction.hpp ------------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/Abstraction.hpp
 ///
 /// \author David Juhasz (david.juhasz@tuwien.ac.at)
 ///
 /// \date 2017
 ///
 /// \brief Definition of *abstraction* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_ABSTRACTION_HPP
 #define ROSA_AGENT_ABSTRACTION_HPP
 
-#include "rosa/agent/Module.h"
+#include "rosa/agent/Functionality.h"
 
 #include "rosa/support/debug.hpp"
 
 #include <algorithm>
 #include <map>
 
 namespace rosa {
 namespace agent {
 
 /// Abstracts values from a type to another one.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
-template <typename T, typename A> class Abstraction : public Module {
+template <typename T, typename A> class Abstraction : public Functionality {
 protected:
   /// Value to abstract to by default.
   const A Default;
 
 public:
   /// Creates an instance.
   ///
   /// \param Default value to abstract to by default
   Abstraction(const A Default) noexcept : Default(Default) {}
 
   /// Destroys \p this object.
   ~Abstraction(void) = default;
 
   /// Abstracts a value from type \p T to type \p A.
   ///
   /// \note The default implementation always returns
   /// \c rosa::agent::Abstraction::Default, hence the actual argument is
   /// ignored.
   ///
   /// \return the abstracted value
   virtual A operator()(const T &) const noexcept { return Default; }
 };
 
 /// Implements \c rosa::agent::Abstraction as a \c std::map from a type to
 /// another one.
 ///
 /// \note This implementation is supposed to be used to abstract between
 /// enumeration types, which is statically enforced.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
 template <typename T, typename A>
 class MapAbstraction : public Abstraction<T, A>, private std::map<T, A> {
   // Make sure the actual type arguments are enumerations.
   STATIC_ASSERT((std::is_enum<T>::value && std::is_enum<A>::value),
                 "mapping not enumerations");
 
   // Bringing into scope inherited members.
   using Abstraction<T, A>::Default;
   using std::map<T, A>::end;
   using std::map<T, A>::find;
 
 public:
   /// Creates an instance by initializing the underlying \c std::map.
   ///
   /// \param Map the mapping to do abstraction according to
   /// \param Default value to abstract to by default
   MapAbstraction(const std::map<T, A> &Map, const A Default) noexcept
       : Abstraction<T, A>(Default),
         std::map<T, A>(Map) {}
 
   /// Destroys \p this object.
   ~MapAbstraction(void) = default;
 
   /// Abstracts a value from type \p T to type \p A based on the set mapping.
   ///
   /// Results in the value associated by the set mapping to the argument, or
   /// \c rosa::agent::MapAbstraction::Default if the actual argument is not
   /// associated with anything by the set mapping.
   ///
   /// \param V value to abstract
   ///
   /// \return the abstracted value based on the set mapping
   A operator()(const T &V) const noexcept override {
     const auto I = find(V);
     return I == end() ? Default : *I;
   }
 };
 
 /// Implements \c rosa::agent::Abstraction as a \c std::map from ranges of a
 /// type to values of another type.
 ///
 /// \note This implementation is supposed to be used to abstract ranges of
 /// arithmetic types into enumerations, which is statically enforced.
 ///
 /// \invariant The keys in the underlying \c std::map define valid ranges
 /// such that `first <= second` and there are no overlapping ranges defined by
 /// the keys.
 ///
 /// \tparam T type to abstract from
 /// \tparam A type to abstract to
 template <typename T, typename A>
 class RangeAbstraction : public Abstraction<T, A>,
                          private std::map<std::pair<T, T>, A> {
   // Make sure the actual type arguments are matching our expectations.
   STATIC_ASSERT((std::is_arithmetic<T>::value), "abstracting not arithmetic");
   STATIC_ASSERT((std::is_enum<A>::value), "abstracting not to enumeration");
 
   // Bringing into scope inherited members.
   using Abstraction<T, A>::Default;
   using std::map<std::pair<T, T>, A>::begin;
   using std::map<std::pair<T, T>, A>::end;
   using std::map<std::pair<T, T>, A>::find;
 
 public:
   /// Creates an instance by Initializing the unserlying \c std::map.
   ///
   /// \param Map the mapping to do abstraction according to
   /// \param Default value to abstract to by default
   ///
   /// \pre Each key defines a valid range such that `first <= second` and
   /// there are no overlapping ranges defined by the keys.
   RangeAbstraction(const std::map<std::pair<T, T>, A> &Map, const A &Default)
       : Abstraction<T, A>(Default), std::map<std::pair<T, T>, A>(Map) {
     // Sanity check.
     ASSERT(std::all_of(
         begin(), end(), [this](const std::pair<std::pair<T, T>, A> &P) {
           return P.first.first <= P.first.second &&
                  std::all_of(++find(P.first), end(),
                              [&P](const std::pair<std::pair<T, T>, A> &R) {
                                // \note Values in \c Map are sorted.
                                return P.first.first < P.first.second &&
                                           P.first.second <= R.first.first ||
                                       P.first.first == P.first.second &&
                                           P.first.second < R.first.first;
                              });
         }));
   }
 
   /// Destroys \p this object.
   ~RangeAbstraction(void) = default;
 
   /// Abstracts a value from type \p T to type \p A based on the set mapping.
   ///
   /// Results in the value associated by the set mapping to the argument, or
   /// \c rosa::agent::RangeAbstraction::Default if the actual argument is not
   /// included in any of the ranges in the set mapping.
   ///
   /// \param V value to abstract
   ///
   /// \return the abstracted value based on the set mapping
   A operator()(const T &V) const noexcept override {
     auto I = begin();
     bool Found = false;  // Indicates if \c I refers to a matching range.
     bool Failed = false; // Indicates if it is pointless to continue searching.
     while (!Found && !Failed && I != end()) {
       if (V < I->first.first) {
         // No match so far and \p V is below the next range, never will match.
         // \note Keys are sorted in the map.
         Failed = true;
       } else if (I->first.first <= V && V < I->first.second) {
         // Matching range found.
         Found = true;
       } else {
         // Cannot conclude in this step, move to the next range.
         ++I;
       }
     }
     ASSERT(!Found || I != end());
     return Found ? I->second : Default;
   }
 };
 
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_ABSTRACTION_HPP
diff --git a/include/rosa/agent/Confidence.hpp b/include/rosa/agent/Confidence.hpp
index 960c712..3d07606 100644
--- a/include/rosa/agent/Confidence.hpp
+++ b/include/rosa/agent/Confidence.hpp
@@ -1,204 +1,204 @@
 //===-- rosa/agent/Confidence.hpp -------------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/Confidence.hpp
 ///
 /// \author David Juhasz (david.juhasz@tuwien.ac.at)
 ///
 /// \date 2017
 ///
 /// \brief Definition of *confidence* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_CONFIDENCE_HPP
 #define ROSA_AGENT_CONFIDENCE_HPP
 
 #include "rosa/agent/History.hpp"
 
 #include "rosa/support/debug.hpp"
 
 #include <limits>
 
 namespace rosa {
 namespace agent {
 
 /// Confidence validator.
 ///
 /// Checks the plausibility of given values by validating if a valid region
 /// contains them. It also capable of checking consistency by validating the
 /// rate of change recorded by a \c rosa::agent::History object against a
 /// maximal absolute valid rate of change.
 ///
 /// \tparam T type of values to validate
 ///
 /// \note The template is defined only for arithmetic types.
 ///
 /// \note The lower bound is inclusive and the upper bound is exclusive.
 ///
 /// \invariant The bounds are defined in a meaningful way:\code
 /// LowerBound <= UpperBound
 /// \endcode
-template <typename T> class Confidence : public Module {
+template <typename T> class Confidence : public Functionality {
   // Make sure the actual type argument is an arithmetic type.
   STATIC_ASSERT(std::is_arithmetic<T>::value, "not arithmetic Confidence");
 
 public:
   /// Unsigned type corresponding to \p T.
   using UT = unsigned_t<T>;
 
   /// The minimal value of type \p T.
   /// \note Not exist \c V of type \p T such that `V < Min`.
   static constexpr T Min = std::is_integral<T>::value
                                ? std::numeric_limits<T>::min()
                                : std::numeric_limits<T>::lowest();
 
   /// The maximal value of type \p T.
   /// \note Not exist \c V of type \p T such that `V > Max`.
   static constexpr T Max =
       (std::is_integral<T>::value || !std::numeric_limits<T>::has_infinity)
           ? std::numeric_limits<T>::max()
           : std::numeric_limits<T>::infinity();
 
   /// The maximal value of type \c UT.
   /// \note Not exist \c V of type \c UT such that `V > UnsignedMax`.
   static constexpr UT UnsignedMax =
       (std::is_integral<UT>::value || !std::numeric_limits<UT>::has_infinity)
           ? std::numeric_limits<UT>::max()
           : std::numeric_limits<UT>::infinity();
 
 private:
   /// The inclusive lower bound for plausibility check.
   T LowerBound;
 
   /// The exclusive upper bound for plausibility check.
   T UpperBound;
 
   /// The maximal absolute rate of change for consistency check.
   UT ChangeRate;
 
 public:
   /// Creates an instance by setting the validator variables.
   ///
   /// \param LowerBound the lower bound for plausability check
   /// \param UpperBound the upper bound for plausability check
   /// \param ChangeRate maximal absolute rate of change for consistency check
   ///
   /// \pre The bounds are defined in a meaningful way:\code
   /// LowerBound <= UpperBound
   /// \endcode
   Confidence(const T LowerBound = Min, const T UpperBound = Max,
              const UT ChangeRate = UnsignedMax) noexcept
       : LowerBound(LowerBound),
         UpperBound(UpperBound),
         ChangeRate(ChangeRate) {
     // Make sure Confidence is created in a valid state.
     if (LowerBound > UpperBound) {
       ROSA_CRITICAL("Confidence with LowerBound higher than UpperBound");
     }
   }
 
   /// Destroys \p this object.
   ~Confidence(void) = default;
 
   /// Gives a snapshot of the current state of the validator variables.
   ///
   /// \param [out] LowerBound to copy \c rosa::agent::Confidence::LowerBound
   /// into
   /// \param [out] UpperBound to copy \c rosa::agent::Confidence::UpperBound
   /// into
   /// \param [out] ChangeRate to copy \c rosa::agent::Confidence::ChangeRate
   /// into
   void getParameters(T &LowerBound, T &UpperBound, UT &ChangeRate) const
       noexcept {
     // Copy members to the given references.
     LowerBound = this->LowerBound;
     UpperBound = this->UpperBound;
     ChangeRate = this->ChangeRate;
   }
 
   /// Sets the lower bound for plausability check.
   ///
   /// Beyond setting the lower bound, the function also adjusts the upper bound
   /// to the given lower bound if the new lower bound would be higher than the
   /// upper bound.
   ///
   /// \param LowerBound the new lower bound to set
   void setLowerBound(const T LowerBound) noexcept {
     // Adjust UpperBound if necessary, then set LowerBound.
     if (UpperBound < LowerBound) {
       UpperBound = LowerBound;
     }
     this->LowerBound = LowerBound;
   }
 
   /// Sets the upper bound for plausability check.
   ///
   /// Beyond setting the upper bound, the function also adjusts the lower bound
   /// to the given upper bound if the new upper bound would be lower than the
   /// lower bound.
   ///
   /// \param UpperBound the new upper bound to set
   void setUpperBound(const T UpperBound) noexcept {
     // Adjust LowerBound if necessary, then set UpperBound.
     if (UpperBound < LowerBound) {
       LowerBound = UpperBound;
     }
     this->UpperBound = UpperBound;
   }
 
   /// Sets the maximal rate of change for consistency check.
   ///
   /// \param ChangeRate the new rate of change to set
   void setChangeRate(const UT ChangeRate) noexcept {
     // Set ChangeRate.
     this->ChangeRate = ChangeRate;
   }
 
   /// Tells the binary confidence on the plausibility of a value.
   ///
   /// \param V value to check
   ///
   /// \return whether \c V is within the range defined by
   /// \c rosa::agent::Confidence::LowerBound and
   /// \c rosa::agent::Confidence::UpperBound.
   bool operator()(const T V) const noexcept {
     // Return if \c V is plausible.
     return LowerBound <= V && V < UpperBound;
   }
 
   /// Tells the binary confidence on the plausibility and consistency of the
   /// last value recorded by a \c rosa::agent::History instance.
   ///
   /// Consistency of the last value is checked by validating the difference with
   /// its preceding entry.
   ///
   /// \note The \c rosa::agent::History instance needs to store values of type
   /// \p T.
   ///
   /// \note An empty \c rosa::agent::History instance results in full
   /// confidence.
   ///
   /// \tparam N number of values \p H is able to store
   /// \tparam P retention policy followed by \p H when capacity is reached
   ///
   /// \param H *history* whose last entry to check
   template <size_t N, HistoryPolicy P>
   bool operator()(const History<T, N, P> &H) const noexcept {
     if (H.empty()) {
       // No entry to validate.
       return true;
     } else {
       // Validate the last entry and the one step average absolute difference.
       return (*this)(H.entry()) && H.averageAbsDiff(1) <= ChangeRate;
     }
   }
 };
 
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_CONFIDENCE_HPP
diff --git a/include/rosa/agent/Module.h b/include/rosa/agent/Functionality.h
similarity index 60%
rename from include/rosa/agent/Module.h
rename to include/rosa/agent/Functionality.h
index 7961bfe..5825529 100644
--- a/include/rosa/agent/Module.h
+++ b/include/rosa/agent/Functionality.h
@@ -1,34 +1,34 @@
-//===-- rosa/agent/Module.h -------------------------------------*- C++ -*-===//
+//===-- rosa/agent/Functionality.h ------------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
-/// \file rosa/agent/Module.h
+/// \file rosa/agent/Functionality.h
 ///
 /// \author David Juhasz (david.juhasz@tuwien.ac.at)
 ///
 /// \date 2017
 ///
-/// \brief Declaration of `rosa::Module` base-class.
+/// \brief Declaration of `rosa::Functionality` base-class.
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef ROSA_AGENT_MODULE_H
-#define ROSA_AGENT_MODULE_H
+#ifndef ROSA_AGENT_FUNCTIONALITY_H
+#define ROSA_AGENT_FUNCTIONALITY_H
 
 namespace rosa {
 namespace agent {
 
 /// Base class for actual *functionalities* that implement various concepts of
 /// self-awareness and are supposed to be used in implementing *agents*.
-class Module {
+class Functionality {
 public:
-  Module(void) noexcept = default;
-  virtual ~Module(void) = default;
+  Functionality(void) noexcept = default;
+  virtual ~Functionality(void) = default;
 };
 
 } // End namespace agent
 } // End namespace rosa
 
-#endif // ROSA_AGENT_MODULE_H
+#endif // ROSA_AGENT_FUNCTIONALITY_H
diff --git a/include/rosa/agent/History.hpp b/include/rosa/agent/History.hpp
index 7373bad..b6d3877 100644
--- a/include/rosa/agent/History.hpp
+++ b/include/rosa/agent/History.hpp
@@ -1,292 +1,292 @@
 //===-- rosa/agent/History.hpp ----------------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/History.hpp
 ///
 /// \author David Juhasz (david.juhasz@tuwien.ac.at)
 ///
 /// \date 2017
 ///
 /// \brief Definition of *history* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_HISTORY_HPP
 #define ROSA_AGENT_HISTORY_HPP
 
-#include "rosa/agent/Module.h"
+#include "rosa/agent/Functionality.h"
 
 #include "rosa/config/config.h"
 
 #include "rosa/support/debug.hpp"
 #include "rosa/support/type_helper.hpp"
 
 #include <array>
 
 namespace rosa {
 namespace agent {
 
 /// Retention policies defining what a \c rosa::agent::History instance should
 /// do when the number of recorded entries reached its capacity.
 enum class HistoryPolicy {
   SRWF, ///< Stop Recording When Full -- no new entry is recorded when full
   FIFO  ///< First In First Out -- overwrite the earliest entry with a new one
 };
 
 /// Implements *history* by recording and storing values.
 ///
 /// \note Not thread-safe implementation, which should not be a problem as any
-/// instance of \c rosa::agent::Module is an internal component of a
+/// instance of \c rosa::agent::Functionality is an internal component of a
 /// \c rosa::Agent, which is the basic unit of concurrency.
 ///
 /// \tparam T type of values to store
 /// \tparam N number of values to store at most
 /// \tparam P retention policy to follow when capacity is reached
 ///
 /// \invariant The size of the underlying \c std::array is `N + 1`:\code
 /// max_size() == N + 1 && N == max_size() - 1
 /// \endcode
 template <typename T, size_t N, HistoryPolicy P>
-class History : public Module, private std::array<T, N + 1> {
+class History : public Functionality, private std::array<T, N + 1> {
 
   // Bring into scope inherited functions that are used.
   using std::array<T, N + 1>::max_size;
   using std::array<T, N + 1>::operator[];
 
   /// The index of the first data element in the circular buffer.
   size_t Data;
 
   /// The index of the first empty slot in the circular buffer.
   size_t Space;
 
 public:
   /// Creates an instances by initializing the indices for the circular buffer.
   History(void) noexcept : Data(0), Space(0) {}
 
   /// Destroys \p this object.
   ~History(void) = default;
 
   /// Tells the retention policy applied to \p this object.
   ///
   /// \return \c rosa::agent::History::P
   static constexpr HistoryPolicy policyOfHistory(void) noexcept { return P; }
 
   /// Tells how many entries may be recorded by \c this object.
   ///
   /// \note The number of entries that are actually recorded may be smaller.
   ///
   /// \return \c rosa::agent::History::N
   static constexpr size_t lengthOfHistory(void) noexcept { return N; }
 
   /// Tells how many entries are currently recorded by \p this object.
   ///
   /// \return number of entries currently recorded by \p this object.
   ///
   /// \post The returned value cannot be larger than the capacity of \p this
   /// object:\code
   /// 0 <= numberOfEntries() && numberOfEntries <= lengthOfHistory()
   /// \endcode
   size_t numberOfEntries(void) const noexcept {
     return Data <= Space ? Space - Data : max_size() - Data + Space;
   }
 
   /// Tells if \p this object has not recorded anything yet.
   ///
   /// \return if \p this object has no entries recorded
   bool empty(void) const noexcept { return numberOfEntries() == 0; }
 
   /// Gives a constant lvalue reference to an entry stored in \p this object.
   ///
   /// \note The recorded entries are indexed starting from the latest one.
   ///
   /// \param I the index at which the stored entry to take from
   ///
   /// \pre \p I is a valid index:\code
   /// 0 <= I && I <= numberOfEntries()
   /// \endcode
   const T &entry(const size_t I = 0) const noexcept {
     ASSERT(0 <= I && I < numberOfEntries()); // Boundary check.
     // Position counted back from the last recorded entry.
     typename std::make_signed<const size_t>::type Pos = Space - (1 + I);
     // Actual index wrapped around to the end of the buffer if negative.
     return (*this)[Pos >= 0 ? Pos : max_size() + Pos];
   }
 
 private:
   /// Tells if the circular buffer is full.
   ///
   /// \return if the circular buffer is full.
   bool full(void) const noexcept { return numberOfEntries() == N; }
 
   /// Pushes a new entry into the circular buffer.
   ///
   /// \note The earliest entry gets overwritten if the buffer is full.
   ///
   /// \param V value to push into the buffer
   void pushBack(const T &V) noexcept {
     // Store value to the first empty slot and step Space index.
     (*this)[Space] = V;
     Space = (Space + 1) % max_size();
     if (Data == Space) {
       // Buffer was full, step Data index.
       Data = (Data + 1) % max_size();
     }
   }
 
 public:
   /// Adds a new entry to \p this object and tells if the operation was
   /// successful.
   ///
   /// \note Success of the operation depends on the actual policy.
   ///
   /// \param V value to store
   ///
   /// \return if \p V was successfully stored
   bool addEntry(const T &V) noexcept {
     switch (P) {
     default:
       ROSA_CRITICAL("unkown HistoryPolicy");
     case HistoryPolicy::SRWF:
       if (full()) {
         return false;
       }
     // \note Fall through to FIFO which unconditionally pushes the new entry.
     case HistoryPolicy::FIFO:
       // FIFO and SRWF not full.
       pushBack(V);
       return true;
     }
   }
 
   /// Tells the trend set by the entries recorded by \p this object.
   ///
   /// The number of steps to go back when calculating the trend is defined as
   /// argument to the function.
   ///
   /// \note The number of steps that can be made is limited by the number of
   /// entries recorded by \p this object.
   ///
   /// \note The function is made a template only to be able to use
   /// \c std::enable_if.
   ///
   /// \tparam X always use the default!
   ///
   /// \param D number of steps to go back in *history*
   ///
   /// \return trend set by analyzed entries
   ///
   /// \pre Statically, \p this object stores signed arithmetic values:\code
   /// std::is_arithmetic<T>::value && std::is_signed<T>::value
   /// \endcode Dynamically, \p D is a valid number of steps to take:\code
   /// 0 <= D && D < N
   /// \endcode
   template <typename X = T>
   typename std::enable_if<
       std::is_arithmetic<X>::value && std::is_signed<X>::value, X>::type
   trend(const size_t D = N - 1) const noexcept {
     STATIC_ASSERT((std::is_same<X, T>::value), "not default template arg");
     ASSERT(0 <= D && D < N); // Boundary check.
     if (numberOfEntries() < 2 || D < 1) {
       // No entries for computing trend.
       return {}; // Zero element of \p T
     } else {
       // Here at least two entries.
       // \c S is the number of steps that can be done.
       const size_t S = std::min(numberOfEntries() - 1, D);
       size_t I = S;
 
       // Compute trend with linear regression.
       size_t SumIndices = 0;
       T SumEntries = {};
       T SumSquareEntries = {};
       T SumProduct = {};
       while (I > 0) {
         // \note Indexing for the regression starts in the past.
         const size_t Index = S - I;
         const T Entry = entry(--I);
         SumIndices += Index;
         SumEntries += Entry;
         SumSquareEntries += Entry * Entry;
         SumProduct += Entry * Index;
       }
 
       return (SumProduct * S - SumEntries * SumIndices) /
              (SumSquareEntries * S - SumEntries * SumEntries);
     }
   }
 
   /// Tells the average absolute difference between consequtive entries recorded
   /// by \p this object
   /// The number of steps to go back when calculating the average is defined as
   /// argument to the function.
   ///
   /// \note The number of steps that can be made is limited by the number of
   /// entries recorded by \p this object.
   ///
   /// \note The function is made a template only to be able to use
   /// \c std::enable_if.
   ///
   /// \tparam X always use the default!
   ///
   /// \param D number of steps to go back in *history*
   ///
   /// \pre Statically, \p this object stores arithmetic values:\code
   /// std::is_arithmetic<T>::value
   /// \endcode Dynamically, \p D is a valid number of steps to take:\code
   /// 0 <= D && D < N
   /// \endcode
   template <typename X = T>
   typename std::enable_if<std::is_arithmetic<X>::value, unsigned_t<X>>::type
   averageAbsDiff(const size_t D = N - 1) const noexcept {
     STATIC_ASSERT((std::is_same<X, T>::value), "not default template arg");
     ASSERT(0 <= D && D < N); // Boundary check.
     if (numberOfEntries() < 2 || D < 1) {
       // No difference to average.
       return {}; // Zero element of \p T
     } else {
       // Here at least two entries.
       // \c S is the number of steps that can be done.
       const size_t S = std::min(numberOfEntries() - 1, D);
 
       // Sum up differences as non-negative values only, hence using an
       // unsigned variable for that.
       unsigned_t<T> Diffs = {}; // Init to zero.
       // Count down entry indices and sum up all the absolute differences.
       size_t I = S;
       T Last = entry(I);
       while (I > 0) {
         T Next = entry(--I);
         Diffs += Last < Next ? Next - Last : Last - Next;
         Last = Next;
       }
       // Return the average of the summed differences.
       return Diffs / S;
     }
   }
 };
 
 /// Adds a new entry to a \c rosa::agent::History instance.
 ///
 /// \note The result of \c rosa::agent::History::addEntry is ignored.
 ///
 /// \tparam T type of values stored in \p H
 /// \tparam N number of values \p H is able to store
 /// \tparam P retention policy followed by \p H when capacity is reached
 ///
 /// \param H to add a new entry to
 /// \param V value to add to \p H
 ///
 /// \return \p H after adding \p V to it
 template <typename T, size_t N, HistoryPolicy P>
 History<T, N, P> &operator<<(History<T, N, P> &H, const T &V) noexcept {
   H.addEntry(V);
   return H;
 }
 
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_HISTORY_HPP
diff --git a/include/rosa/agent/namespace.h b/include/rosa/agent/namespace.h
index 88c3482..2cd458c 100755
--- a/include/rosa/agent/namespace.h
+++ b/include/rosa/agent/namespace.h
@@ -1,28 +1,28 @@
 //===-- rosa/agent/namespace.h ----------------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/namespace.h
 ///
 /// \author David Juhasz (david.juhasz@tuwien.ac.at)
 ///
 /// \date 2017
 ///
 /// \brief Documentation for namespace \c rosa::agent.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_NAMESPACE_H
 #define ROSA_AGENT_NAMESPACE_H
 
 namespace rosa {
 
-/// Contains facilities that are supposed to be useful for implementing
+/// Contains functionalities that are supposed to be useful for implementing
 /// *agents*.
 namespace agent {}
 
 } // End namespace rosa
 
 #endif // ROSA_AGENT_NAMESPACE_H
diff --git a/lib/agent/CMakeLists.txt b/lib/agent/CMakeLists.txt
index 7a4c03d..81a33f5 100644
--- a/lib/agent/CMakeLists.txt
+++ b/lib/agent/CMakeLists.txt
@@ -1,14 +1,14 @@
 set(LIB_INCLUDE_DIR ${ROSA_MAIN_INCLUDE_DIR}/rosa/agent)
 
 add_library(ROSAAgent
   ${LIB_INCLUDE_DIR}/namespace.h
   namespace.cpp
-  ${LIB_INCLUDE_DIR}/Module.h
-  Module.cpp
+  ${LIB_INCLUDE_DIR}/Functionality.h
+  Functionality.cpp
   ${LIB_INCLUDE_DIR}/Abstraction.hpp
   Abstraction.cpp
   ${LIB_INCLUDE_DIR}/History.hpp
   History.cpp
   ${LIB_INCLUDE_DIR}/Confidence.hpp
   Confidence.cpp
   )
diff --git a/lib/agent/Module.cpp b/lib/agent/Functionality.cpp
similarity index 62%
rename from lib/agent/Module.cpp
rename to lib/agent/Functionality.cpp
index c2a0371..f6b60c4 100644
--- a/lib/agent/Module.cpp
+++ b/lib/agent/Functionality.cpp
@@ -1,20 +1,20 @@
-//===-- agent/Module.cpp ----------------------------------------*- C++ -*-===//
+//===-- agent/Functionality.cpp ---------------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
-/// \file agent/Module.cpp
+/// \file agent/Functionality.cpp
 ///
 /// \author David Juhasz (david.juhasz@tuwien.ac.at)
 ///
 /// \date 2017
 ///
-/// \brief Implementation for rosa/agent/Module.h.
+/// \brief Implementation for rosa/agent/Functionality.h.
 ///
 /// \note Empty implementation, source file here to have a compile database
-///       entry for rosa/agent/Module.h.
+///       entry for rosa/agent/Functionality.h.
 ///
 //===----------------------------------------------------------------------===//
 
-#include "rosa/agent/Module.h"
+#include "rosa/agent/Functionality.h"