diff --git a/MaterialsLib/Adsorption/Adsorption.cpp b/MaterialsLib/Adsorption/Adsorption.cpp
index 9eea90b5b160e12577ccd2d40e3a94d28b87ca67..64d000a76d46760b317789d5b12ab786e496c1ac 100644
--- a/MaterialsLib/Adsorption/Adsorption.cpp
+++ b/MaterialsLib/Adsorption/Adsorption.cpp
@@ -24,7 +24,7 @@ namespace Adsorption
 {
 
 //Saturation pressure for water used in Nunez
-double AdsorptionReaction::get_equilibrium_vapour_pressure(const double T_Ads)
+double AdsorptionReaction::getEquilibriumVapourPressure(const double T_Ads)
 {
     //critical T and p
     const double Tc = 647.3; //K
@@ -42,7 +42,7 @@ double AdsorptionReaction::get_equilibrium_vapour_pressure(const double T_Ads)
 }
 
 //Evaporation enthalpy of water from Nunez
-double AdsorptionReaction::get_evaporation_enthalpy(double T_Ads) //in kJ/kg
+double AdsorptionReaction::getEvaporationEnthalpy(double T_Ads) //in kJ/kg
 {
     T_Ads -= 273.15;
     if (T_Ads <= 10.){
@@ -65,7 +65,7 @@ double AdsorptionReaction::get_evaporation_enthalpy(double T_Ads) //in kJ/kg
 
 
 //evaluate specific heat capacity of adsorbate follwing Nunez
-double AdsorptionReaction::get_specific_heat_capacity(const double T_Ads)
+double AdsorptionReaction::getSpecificHeatCapacity(const double T_Ads)
 {
     const double c[] = {4.224,-3.716e-3,9.351e-5,-7.1786e-7,-9.1266e-9,2.69247e-10,-2.773104e-12,1.553177e-14,-4.982795e-17,8.578e-20,-6.12423e-23};
     double cp = 0.;
@@ -75,32 +75,32 @@ double AdsorptionReaction::get_specific_heat_capacity(const double T_Ads)
 }
 
 
-double AdsorptionReaction::get_molar_fraction(double xm, double M_this, double M_other)
+double AdsorptionReaction::getMolarFraction(double xm, double M_this, double M_other)
 {
     return M_other*xm/(M_other*xm + M_this*(1.0-xm));
 }
 
 
-double AdsorptionReaction::get_mass_fraction(double xn, double M_this, double M_other)
+double AdsorptionReaction::getMassFraction(double xn, double M_this, double M_other)
 {
     return M_this*xn/(M_this*xn + M_other*(1.0-xn));
 }
 
 
-double AdsorptionReaction::d_molar_fraction(double xm, double M_this, double M_other)
+double AdsorptionReaction::dMolarFraction(double xm, double M_this, double M_other)
 {
     return M_other * M_this
             / square(M_other * xm + M_this * (1.0 - xm));
 }
 
 
-double AdsorptionReaction::get_reaction_rate(const double p_Ads, const double T_Ads,
+double AdsorptionReaction::getReactionRate(const double p_Ads, const double T_Ads,
                                      const double M_Ads, const double loading) const
 {
     // const double k_rate = 3.0e-3; //to be specified
 
-    const double A = get_potential(p_Ads, T_Ads, M_Ads);
-    double C_eq = get_adsorbate_density(T_Ads) * characteristic_curve(A);
+    const double A = getPotential(p_Ads, T_Ads, M_Ads);
+    double C_eq = getAdsorbateDensity(T_Ads) * characteristicCurve(A);
     if (C_eq < 0.0) C_eq = 0.0;
 
     // return 0.0; // TODO [CL] for testing only
@@ -109,20 +109,20 @@ double AdsorptionReaction::get_reaction_rate(const double p_Ads, const double T_
                                       // this the rate in terms of loading!
 }
 
-void AdsorptionReaction::get_d_reaction_rate(const double p_Ads, const double T_Ads,
+void AdsorptionReaction::getDReactionRate(const double p_Ads, const double T_Ads,
                                      const double M_Ads, const double /*loading*/,
                                      std::array<double, 3> &dqdr) const
 {
-    const double A = get_potential(p_Ads, T_Ads, M_Ads);
-    const double p_S = get_equilibrium_vapour_pressure(T_Ads);
+    const double A = getPotential(p_Ads, T_Ads, M_Ads);
+    const double p_S = getEquilibriumVapourPressure(T_Ads);
     const double dAdT = GAS_CONST * log(p_S/p_Ads) / (M_Ads*1.e3);
     const double dAdp = - GAS_CONST * T_Ads / M_Ads / p_Ads;
 
-    const double W = characteristic_curve(A);
-    const double dWdA = d_characteristic_curve(A);
+    const double W = characteristicCurve(A);
+    const double dWdA = dCharacteristicCurve(A);
 
-    const double rho_Ads = get_adsorbate_density(T_Ads);
-    const double drhodT = - rho_Ads * get_alphaT(T_Ads);
+    const double rho_Ads = getAdsorbateDensity(T_Ads);
+    const double drhodT = - rho_Ads * getAlphaT(T_Ads);
 
     dqdr = std::array<double, 3>{{
         rho_Ads*dWdA*dAdp,
@@ -133,9 +133,9 @@ void AdsorptionReaction::get_d_reaction_rate(const double p_Ads, const double T_
 
 
 //Evaluate adsorbtion potential A
-double AdsorptionReaction::get_potential(const double p_Ads, double T_Ads, const double M_Ads) const
+double AdsorptionReaction::getPotential(const double p_Ads, double T_Ads, const double M_Ads) const
 {
-    double A = GAS_CONST * T_Ads * log(get_equilibrium_vapour_pressure(T_Ads)/p_Ads) / (M_Ads*1.e3); //in kJ/kg = J/g
+    double A = GAS_CONST * T_Ads * log(getEquilibriumVapourPressure(T_Ads)/p_Ads) / (M_Ads*1.e3); //in kJ/kg = J/g
     if (A < 0.0) {
         // vapour partial pressure > saturation pressure
         // A = 0.0; // TODO [CL] debug output
@@ -144,20 +144,20 @@ double AdsorptionReaction::get_potential(const double p_Ads, double T_Ads, const
 }
 
 
-double AdsorptionReaction::get_loading(const double rho_curr, const double rho_dry)
+double AdsorptionReaction::getLoading(const double rho_curr, const double rho_dry)
 {
     return rho_curr / rho_dry - 1.0;
 }
 
 
 //Calculate sorption entropy
-double AdsorptionReaction::get_entropy(const double T_Ads, const double A) const
+double AdsorptionReaction::getEntropy(const double T_Ads, const double A) const
 {
     const double epsilon = 1.0e-8;
 
     //* // This change will also change simulation results.
-    const double W_p = characteristic_curve(A+epsilon);
-    const double W_m = characteristic_curve(A-epsilon);
+    const double W_p = characteristicCurve(A+epsilon);
+    const double W_m = characteristicCurve(A-epsilon);
     const double dAdlnW = 2.0*epsilon/(log(W_p/W_m));
     // */
 
@@ -167,27 +167,27 @@ double AdsorptionReaction::get_entropy(const double T_Ads, const double A) const
         return 0.0;
     }
 
-    // const double dAdlnW = 2.0*epsilon/(log(characteristic_curve(A+epsilon)) - log(characteristic_curve(A-epsilon)));
-    return dAdlnW * get_alphaT(T_Ads);
+    // const double dAdlnW = 2.0*epsilon/(log(characteristicCurve(A+epsilon)) - log(characteristicCurve(A-epsilon)));
+    return dAdlnW * getAlphaT(T_Ads);
 }
 
 
 //Calculate sorption enthalpy
-double AdsorptionReaction::get_enthalpy(const double p_Ads, const double T_Ads, const double M_Ads) const
+double AdsorptionReaction::getEnthalpy(const double p_Ads, const double T_Ads, const double M_Ads) const
 {
     // TODO [CL] consider using A as obtained from current loading (needs inverse CC A(W)) instead of p_Vapour, T_Vapour
-    const double A = get_potential(p_Ads, T_Ads, M_Ads);
+    const double A = getPotential(p_Ads, T_Ads, M_Ads);
 
     // return 0.0; // TODO [CL] for testing only
-    return (get_evaporation_enthalpy(T_Ads) + A - T_Ads * get_entropy(T_Ads,A))*1000.0; //in J/kg
+    return (getEvaporationEnthalpy(T_Ads) + A - T_Ads * getEntropy(T_Ads,A))*1000.0; //in J/kg
 }
 
 
-double AdsorptionReaction::get_equilibrium_loading(const double p_Ads, const double T_Ads,
+double AdsorptionReaction::getEquilibriumLoading(const double p_Ads, const double T_Ads,
                                            const double M_Ads) const
 {
-    const double A = get_potential(p_Ads, T_Ads, M_Ads);
-    return get_adsorbate_density(T_Ads) * characteristic_curve(A);
+    const double A = getPotential(p_Ads, T_Ads, M_Ads);
+    return getAdsorbateDensity(T_Ads) * characteristicCurve(A);
 }
 
 
diff --git a/MaterialsLib/Adsorption/Adsorption.h b/MaterialsLib/Adsorption/Adsorption.h
index f8b20fea874a5f47fd1ec65c867557534fd820f5..e45f9bdc70a8ab1b60ed31b206117c36b01663c7 100644
--- a/MaterialsLib/Adsorption/Adsorption.h
+++ b/MaterialsLib/Adsorption/Adsorption.h
@@ -27,25 +27,25 @@ class AdsorptionReaction : public Reaction
 {
 public:
     // TODO [CL] move those three methods to water properties class
-    static double get_evaporation_enthalpy(const double T_Ads);
-    static double get_equilibrium_vapour_pressure(const double T_Ads);
-    static double get_specific_heat_capacity(const double T_Ads); // TODO [CL] why unused?
+    static double getEvaporationEnthalpy(const double T_Ads);
+    static double getEquilibriumVapourPressure(const double T_Ads);
+    static double getSpecificHeatCapacity(const double T_Ads); // TODO [CL] why unused?
 
-    static double get_molar_fraction(double xm, double M_this, double M_other);
-    static double get_mass_fraction(double xn, double M_this, double M_other);
-    static double d_molar_fraction(double xm, double M_this, double M_other);
+    static double getMolarFraction(double xm, double M_this, double M_other);
+    static double getMassFraction(double xn, double M_this, double M_other);
+    static double dMolarFraction(double xm, double M_this, double M_other);
 
-    static double get_loading(const double rho_curr, const double rho_dry);
+    static double getLoading(const double rho_curr, const double rho_dry);
 
 // non-virtual members
-    double get_equilibrium_loading(const double p_Ads, const double T_Ads, const double M_Ads)
+    double getEquilibriumLoading(const double p_Ads, const double T_Ads, const double M_Ads)
     const override;
 
 // virtual members:
     virtual ~AdsorptionReaction() = default;
 
-    virtual double get_enthalpy(const double p_Ads, const double T_Ads, const double M_Ads) const override;
-    virtual double get_reaction_rate(const double p_Ads, const double T_Ads,
+    virtual double getEnthalpy(const double p_Ads, const double T_Ads, const double M_Ads) const override;
+    virtual double getReactionRate(const double p_Ads, const double T_Ads,
                                      const double M_Ads, const double loading) const override;
     /**
      * @brief get_d_reaction_rate
@@ -55,24 +55,24 @@ public:
      * @param loading
      * @param dqdr array containing the differentials wrt: p, T, C
      */
-    virtual void get_d_reaction_rate(const double p_Ads, const double T_Ads,
+    virtual void getDReactionRate(const double p_Ads, const double T_Ads,
                                      const double M_Ads, const double loading,
                                      std::array<double, 3>& dqdr) const;
 
 protected:
-    virtual double get_adsorbate_density(const double T_Ads) const = 0;
-    virtual double get_alphaT(const double T_Ads) const = 0;
-    virtual double characteristic_curve(const double A) const = 0;
-    virtual double d_characteristic_curve(const double A) const = 0;
+    virtual double getAdsorbateDensity(const double T_Ads) const = 0;
+    virtual double getAlphaT(const double T_Ads) const = 0;
+    virtual double characteristicCurve(const double A) const = 0;
+    virtual double dCharacteristicCurve(const double A) const = 0;
 
 private:
 // non-virtual members
-    double get_potential(const double p_Ads, const double T_Ads, const double M_Ads) const;
-    double get_entropy(const double T_Ads, const double A) const;
+    double getPotential(const double p_Ads, const double T_Ads, const double M_Ads) const;
+    double getEntropy(const double T_Ads, const double A) const;
 };
 
 
-inline double curve_polyfrac(const double* coeffs, const double x)
+inline double curvePolyfrac(const double* coeffs, const double x)
 {
     return ( coeffs[0] + coeffs[2] * x + coeffs[4] * pow(x,2) + coeffs[6] * pow(x,3) )
             / ( 1.0 + coeffs[1] * x + coeffs[3] * pow(x,2) + coeffs[5] * pow(x,3) );
@@ -90,7 +90,7 @@ inline double curve_polyfrac(const double* coeffs, const double x)
     //        / ( 1.0 + x * coeffs[1] + x*x * coeffs[3] + x*x*x * coeffs[5] );
 }
 
-inline double d_curve_polyfrac(const double* coeffs, const double x)
+inline double dCurvePolyfrac(const double* coeffs, const double x)
 {
     const double x2 = x*x;
     const double x3 = x2*x;
diff --git a/MaterialsLib/Adsorption/Density100MPa.cpp b/MaterialsLib/Adsorption/Density100MPa.cpp
index 9f4923ef4b2991f47073d87068c23b9a9cfc9d3e..1e75ee195728f669f5d3a724e80fdea257a6db57 100644
--- a/MaterialsLib/Adsorption/Density100MPa.cpp
+++ b/MaterialsLib/Adsorption/Density100MPa.cpp
@@ -29,14 +29,14 @@ const double c[] = {
 namespace Adsorption
 {
 
-double Density100MPa::get_adsorbate_density(const double T_Ads) const
+double Density100MPa::getAdsorbateDensity(const double T_Ads) const
 {
     return -0.0013*T_Ads*T_Ads + 0.3529*T_Ads + 1049.2;
 }
 
 
 //Thermal expansivity model for water found in the works of Hauer
-double Density100MPa::get_alphaT(const double T_Ads) const
+double Density100MPa::getAlphaT(const double T_Ads) const
 {
     const double rho    = -0.0013*T_Ads*T_Ads+0.3529*T_Ads+1049.2;
     const double drhodT = -0.0026*T_Ads + 0.3529;
@@ -46,9 +46,9 @@ double Density100MPa::get_alphaT(const double T_Ads) const
 
 
 //Characteristic curve. Return W (A)
-double Density100MPa::characteristic_curve(const double A) const
+double Density100MPa::characteristicCurve(const double A) const
 {
-    double W = curve_polyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(c, A); //cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -57,9 +57,9 @@ double Density100MPa::characteristic_curve(const double A) const
     return W/1.e3; //m^3/kg
 }
 
-double Density100MPa::d_characteristic_curve(const double A) const
+double Density100MPa::dCharacteristicCurve(const double A) const
 {
-    return d_curve_polyfrac(c, A);
+    return dCurvePolyfrac(c, A);
 }
 
 }
diff --git a/MaterialsLib/Adsorption/Density100MPa.h b/MaterialsLib/Adsorption/Density100MPa.h
index 6f09d7b2e5736ca9762ca34776b084e95a56d0fe..b6d20166e128f7b351931cd616dc87f96b92b128 100644
--- a/MaterialsLib/Adsorption/Density100MPa.h
+++ b/MaterialsLib/Adsorption/Density100MPa.h
@@ -17,10 +17,10 @@ namespace Adsorption
 class Density100MPa : public AdsorptionReaction
 {
 public:
-    double get_adsorbate_density(const double T_Ads) const;
-    double get_alphaT(const double T_Ads) const;
-    double characteristic_curve(const double A) const;
-    double d_characteristic_curve(const double A) const;
+    double getAdsorbateDensity(const double T_Ads) const;
+    double getAlphaT(const double T_Ads) const;
+    double characteristicCurve(const double A) const;
+    double dCharacteristicCurve(const double A) const;
 };
 
 }
diff --git a/MaterialsLib/Adsorption/DensityConst.cpp b/MaterialsLib/Adsorption/DensityConst.cpp
index ad60bdeb4cfac074fe8a2dbb8c17b28a6db8091f..6c20e2a101f5b9b9bdbf5e850411aa904499b880 100644
--- a/MaterialsLib/Adsorption/DensityConst.cpp
+++ b/MaterialsLib/Adsorption/DensityConst.cpp
@@ -30,23 +30,23 @@ const double c[] = {
 namespace Adsorption
 {
 
-double DensityConst::get_adsorbate_density(const double /*T_Ads*/) const
+double DensityConst::getAdsorbateDensity(const double /*T_Ads*/) const
 {
-    return rho_water_Hauer(150.0+273.15);
+    return rhoWaterHauer(150.0+273.15);
 }
 
 
 //Thermal expansivity model for water found in the works of Hauer
-double DensityConst::get_alphaT(const double /*T_Ads*/) const
+double DensityConst::getAlphaT(const double /*T_Ads*/) const
 {
     return 0.0;
 }
 
 
 //Characteristic curve. Return W (A)
-double DensityConst::characteristic_curve(const double A) const
+double DensityConst::characteristicCurve(const double A) const
 {
-    double W = curve_polyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(c, A); //cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -55,9 +55,9 @@ double DensityConst::characteristic_curve(const double A) const
     return W/1.e3; //m^3/kg
 }
 
-double DensityConst::d_characteristic_curve(const double A) const
+double DensityConst::dCharacteristicCurve(const double A) const
 {
-    return d_curve_polyfrac(c, A);
+    return dCurvePolyfrac(c, A);
 }
 
 }
diff --git a/MaterialsLib/Adsorption/DensityConst.h b/MaterialsLib/Adsorption/DensityConst.h
index d3ecfe140a15cbdf849f151a33e4d0ca2308615b..a72c513179a0d39c91c26a673509cf64c1c0276b 100644
--- a/MaterialsLib/Adsorption/DensityConst.h
+++ b/MaterialsLib/Adsorption/DensityConst.h
@@ -17,10 +17,10 @@ namespace Adsorption
 class DensityConst : public AdsorptionReaction
 {
 public:
-    double get_adsorbate_density(const double T_Ads) const;
-    double get_alphaT(const double T_Ads) const;
-    double characteristic_curve(const double A) const;
-    double d_characteristic_curve(const double A) const;
+    double getAdsorbateDensity(const double T_Ads) const;
+    double getAlphaT(const double T_Ads) const;
+    double characteristicCurve(const double A) const;
+    double dCharacteristicCurve(const double A) const;
 };
 
 }
diff --git a/MaterialsLib/Adsorption/DensityCook.cpp b/MaterialsLib/Adsorption/DensityCook.cpp
index 1dc4a37c23b5348c01cc12239d9dd8e680e164cf..89db1ba21d36dab21b59b546a1e8652641189960 100644
--- a/MaterialsLib/Adsorption/DensityCook.cpp
+++ b/MaterialsLib/Adsorption/DensityCook.cpp
@@ -29,23 +29,23 @@ const double c[] = {
 namespace Adsorption
 {
 
-double DensityCook::get_adsorbate_density(const double T_Ads) const
+double DensityCook::getAdsorbateDensity(const double T_Ads) const
 {
-    return rho_water_Dean(T_Ads);
+    return rhoWaterDean(T_Ads);
 }
 
 
 //Thermal expansivity model for water found in the works of Hauer
-double DensityCook::get_alphaT(const double T_Ads) const
+double DensityCook::getAlphaT(const double T_Ads) const
 {
-    return alphaT_water_Dean(T_Ads);
+    return alphaTWaterDean(T_Ads);
 }
 
 
 //Characteristic curve. Return W (A)
-double DensityCook::characteristic_curve(const double A) const
+double DensityCook::characteristicCurve(const double A) const
 {
-    double W = curve_polyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(c, A); //cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -54,9 +54,9 @@ double DensityCook::characteristic_curve(const double A) const
     return W/1.e3; //m^3/kg
 }
 
-double DensityCook::d_characteristic_curve(const double A) const
+double DensityCook::dCharacteristicCurve(const double A) const
 {
-    return d_curve_polyfrac(c, A);
+    return dCurvePolyfrac(c, A);
 }
 
 }
diff --git a/MaterialsLib/Adsorption/DensityCook.h b/MaterialsLib/Adsorption/DensityCook.h
index efc5797fbfa07e1de337a2553759b7e4396d38ac..2dd39cfd986f0c70d1e8cf8768975d9802af4a0b 100644
--- a/MaterialsLib/Adsorption/DensityCook.h
+++ b/MaterialsLib/Adsorption/DensityCook.h
@@ -17,14 +17,14 @@ namespace Adsorption
 class DensityCook : public AdsorptionReaction
 {
 public:
-    double get_adsorbate_density(const double T_Ads) const;
-    double get_alphaT(const double T_Ads) const;
-    double characteristic_curve(const double A) const;
-    double d_characteristic_curve(const double A) const;
+    double getAdsorbateDensity(const double T_Ads) const;
+    double getAlphaT(const double T_Ads) const;
+    double characteristicCurve(const double A) const;
+    double dCharacteristicCurve(const double A) const;
 };
 
 
-inline double rho_water_Dean(const double T_Ads)
+inline double rhoWaterDean(const double T_Ads)
 {
     const double Tcel = T_Ads - 273.15;
     const double b[] = { 999.9,2.03E-02,-6.16E-03,2.26E-05,-4.68E-08 };
@@ -38,7 +38,7 @@ inline double rho_water_Dean(const double T_Ads)
     }
 }
 
-inline double alphaT_water_Dean(const double T_Ads)
+inline double alphaTWaterDean(const double T_Ads)
 {
     const double Tcel = T_Ads - 273.15;
     const double b[] = { 999.9,2.03E-02,-6.16E-03,2.26E-05,-4.68E-08 };
diff --git a/MaterialsLib/Adsorption/DensityDubinin.cpp b/MaterialsLib/Adsorption/DensityDubinin.cpp
index edc78df4f7b26bea29c1b937e6954e58001dd191..ac875c05eaecc116aff8557631d65b0b73b01a1d 100644
--- a/MaterialsLib/Adsorption/DensityDubinin.cpp
+++ b/MaterialsLib/Adsorption/DensityDubinin.cpp
@@ -31,18 +31,18 @@ const double c[] = {
 namespace Adsorption
 {
 
-double DensityDubinin::get_adsorbate_density(const double T_Ads) const
+double DensityDubinin::getAdsorbateDensity(const double T_Ads) const
 {
     const double Tb = 373.1;
 
     if (T_Ads < Tb) {
-        return rho_water_Dean(T_Ads);
+        return rhoWaterDean(T_Ads);
     } else {
         const double Tc = 647.3; //K
         // const double rhoc = 322.; //kg/m^3
         const double pc = 221.2e5; //Pa
         //boiling point density
-        const double rhob = rho_water_Dean(Tb);
+        const double rhob = rhoWaterDean(Tb);
         //state values
         const double R = GAS_CONST;
         const double M = M_H2O;
@@ -55,18 +55,18 @@ double DensityDubinin::get_adsorbate_density(const double T_Ads) const
 
 
 //Thermal expansivity model for water found in the works of Hauer
-double DensityDubinin::get_alphaT(const double T_Ads) const
+double DensityDubinin::getAlphaT(const double T_Ads) const
 {
     const double Tb = 373.1;
     if (T_Ads <= Tb) {
-        return alphaT_water_Dean(T_Ads);
+        return alphaTWaterDean(T_Ads);
     } else {
         //critical T and p
         const double Tc = 647.3; //K
         // const double rhoc = 322.; //kg/m^3
         const double pc = 221.2e5; //Pa
         //boiling point density
-        const double rhob = rho_water_Dean(Tb);
+        const double rhob = rhoWaterDean(Tb);
         //state values
         const double R = GAS_CONST;
         const double M = M_H2O;
@@ -79,9 +79,9 @@ double DensityDubinin::get_alphaT(const double T_Ads) const
 
 
 //Characteristic curve. Return W (A)
-double DensityDubinin::characteristic_curve(const double A) const
+double DensityDubinin::characteristicCurve(const double A) const
 {
-    double W = curve_polyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(c, A); //cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -90,9 +90,9 @@ double DensityDubinin::characteristic_curve(const double A) const
     return W/1.e3; //m^3/kg
 }
 
-double DensityDubinin::d_characteristic_curve(const double A) const
+double DensityDubinin::dCharacteristicCurve(const double A) const
 {
-    return d_curve_polyfrac(c, A);
+    return dCurvePolyfrac(c, A);
 }
 
 }
diff --git a/MaterialsLib/Adsorption/DensityDubinin.h b/MaterialsLib/Adsorption/DensityDubinin.h
index 53122e586473604b7aa8bd50acec72d963194b73..7e19336f93eb981df8f6e9638d808088c993626c 100644
--- a/MaterialsLib/Adsorption/DensityDubinin.h
+++ b/MaterialsLib/Adsorption/DensityDubinin.h
@@ -17,10 +17,10 @@ namespace Adsorption
 class DensityDubinin : public AdsorptionReaction
 {
 public:
-    double get_adsorbate_density(const double T_Ads) const;
-    double get_alphaT(const double T_Ads) const;
-    double characteristic_curve(const double A) const;
-    double d_characteristic_curve(const double A) const;
+    double getAdsorbateDensity(const double T_Ads) const;
+    double getAlphaT(const double T_Ads) const;
+    double characteristicCurve(const double A) const;
+    double dCharacteristicCurve(const double A) const;
 };
 
 }
diff --git a/MaterialsLib/Adsorption/DensityHauer.cpp b/MaterialsLib/Adsorption/DensityHauer.cpp
index 25555b303f694f21e3a0ac30263a5d18bb4470de..09736b08ea2556912f5f1667ab43299d635532c9 100644
--- a/MaterialsLib/Adsorption/DensityHauer.cpp
+++ b/MaterialsLib/Adsorption/DensityHauer.cpp
@@ -29,14 +29,14 @@ const double c[] = {
 namespace Adsorption
 {
 
-double DensityHauer::get_adsorbate_density(const double T_Ads) const
+double DensityHauer::getAdsorbateDensity(const double T_Ads) const
 {
-    return rho_water_Hauer(T_Ads);
+    return rhoWaterHauer(T_Ads);
 }
 
 
 //Thermal expansivity model for water found in the works of Hauer
-double DensityHauer::get_alphaT(const double T_Ads) const
+double DensityHauer::getAlphaT(const double T_Ads) const
 {
     // data like in python script
     const double T0 = 283.15, alpha0 = 3.781e-4; //K; 1/K
@@ -46,9 +46,9 @@ double DensityHauer::get_alphaT(const double T_Ads) const
 
 
 //Characteristic curve. Return W (A)
-double DensityHauer::characteristic_curve(const double A) const
+double DensityHauer::characteristicCurve(const double A) const
 {
-    double W = curve_polyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(c, A); //cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -57,9 +57,9 @@ double DensityHauer::characteristic_curve(const double A) const
     return W/1.e3; //m^3/kg
 }
 
-double DensityHauer::d_characteristic_curve(const double A) const
+double DensityHauer::dCharacteristicCurve(const double A) const
 {
-    return d_curve_polyfrac(c, A);
+    return dCurvePolyfrac(c, A);
 }
 
 }
diff --git a/MaterialsLib/Adsorption/DensityHauer.h b/MaterialsLib/Adsorption/DensityHauer.h
index db5ef9ff4c754b1a8f1c81ae02e463341e6e6529..07b7a7e77dcb13e045d0fdf1037b7bd52fa164ad 100644
--- a/MaterialsLib/Adsorption/DensityHauer.h
+++ b/MaterialsLib/Adsorption/DensityHauer.h
@@ -18,16 +18,16 @@ namespace Adsorption
 class DensityHauer : public AdsorptionReaction
 {
 public:
-    double get_adsorbate_density(const double T_Ads) const;
-    double get_alphaT(const double T_Ads) const;
-    double characteristic_curve(const double A) const;
-    double d_characteristic_curve(const double A) const;
+    double getAdsorbateDensity(const double T_Ads) const;
+    double getAlphaT(const double T_Ads) const;
+    double characteristicCurve(const double A) const;
+    double dCharacteristicCurve(const double A) const;
 };
 
-inline double rho_water_Hauer(const double T_Ads)
+inline double rhoWaterHauer(const double T_Ads)
 {
     // data like in python script
-    const double T0 = 283.15, rho0 = rho_water_Dean(T0), alpha0 = 3.781e-4; //K; kg/m^3; 1/K
+    const double T0 = 283.15, rho0 = rhoWaterDean(T0), alpha0 = 3.781e-4; //K; kg/m^3; 1/K
 
     return rho0 * (1. - alpha0 * (T_Ads-T0)); //in kg/m^3
 }
diff --git a/MaterialsLib/Adsorption/DensityLegacy.cpp b/MaterialsLib/Adsorption/DensityLegacy.cpp
index a007f113c6d0f29e205ed596318a789e51da974d..75dda3555da05fcea14ef05b3958a479aee6b2ba 100644
--- a/MaterialsLib/Adsorption/DensityLegacy.cpp
+++ b/MaterialsLib/Adsorption/DensityLegacy.cpp
@@ -27,7 +27,7 @@ const double c[] = { 0.34102920966608297,
 namespace Adsorption
 {
 
-double DensityLegacy::get_adsorbate_density(const double T_Ads) const
+double DensityLegacy::getAdsorbateDensity(const double T_Ads) const
 {
     //set reference state for adsorbate EOS in Hauer
     const double T0 = 293.15, rho0 = 998.084, alpha0 = 2.06508e-4; //K; kg/m^3; 1/K
@@ -37,7 +37,7 @@ double DensityLegacy::get_adsorbate_density(const double T_Ads) const
 
 
 //Thermal expansivity model for water found in the works of Hauer
-double DensityLegacy::get_alphaT(const double T_Ads) const
+double DensityLegacy::getAlphaT(const double T_Ads) const
 {
     //set reference state for adsorbate EOS in Hauer
     const double T0 = 293.15, /*rho0 = 998.084,*/ alpha0 = 2.06508e-4; //K; kg/m^3; 1/K
@@ -47,9 +47,9 @@ double DensityLegacy::get_alphaT(const double T_Ads) const
 
 
 //Characteristic curve. Return W (A)
-double DensityLegacy::characteristic_curve(const double A) const
+double DensityLegacy::characteristicCurve(const double A) const
 {
-    double W = curve_polyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(c, A); //cm^3/g
 
     /*
     if (W < 0.0) {
@@ -60,9 +60,9 @@ double DensityLegacy::characteristic_curve(const double A) const
     return W/1.e3; //m^3/kg
 }
 
-double DensityLegacy::d_characteristic_curve(const double A) const
+double DensityLegacy::dCharacteristicCurve(const double A) const
 {
-    return d_curve_polyfrac(c, A);
+    return dCurvePolyfrac(c, A);
 }
 
 }
diff --git a/MaterialsLib/Adsorption/DensityLegacy.h b/MaterialsLib/Adsorption/DensityLegacy.h
index 831b35cd74352a42aa6a316c1ad66552647da07f..e9e16b1c539e7348d60b822c8a6123b01e4933ed 100644
--- a/MaterialsLib/Adsorption/DensityLegacy.h
+++ b/MaterialsLib/Adsorption/DensityLegacy.h
@@ -17,10 +17,10 @@ namespace Adsorption
 class DensityLegacy : public AdsorptionReaction
 {
 public:
-    double get_adsorbate_density(const double T_Ads) const;
-    double get_alphaT(const double T_Ads) const;
-    double characteristic_curve(const double A) const;
-    double d_characteristic_curve(const double A) const;
+    double getAdsorbateDensity(const double T_Ads) const;
+    double getAlphaT(const double T_Ads) const;
+    double characteristicCurve(const double A) const;
+    double dCharacteristicCurve(const double A) const;
 };
 
 }
diff --git a/MaterialsLib/Adsorption/DensityMette.cpp b/MaterialsLib/Adsorption/DensityMette.cpp
index 70255204809597d4523e3bd2bd77d5d7576edd1b..1fc19fbf7c35dd29c92be8fd1cd8e9101192ea39 100644
--- a/MaterialsLib/Adsorption/DensityMette.cpp
+++ b/MaterialsLib/Adsorption/DensityMette.cpp
@@ -28,28 +28,28 @@ const double c[] = {
 namespace Adsorption
 {
 
-double DensityMette::get_adsorbate_density(const double T_Ads) const
+double DensityMette::getAdsorbateDensity(const double T_Ads) const
 {
     const double T0 = 293.15;
-    const double rho0 = rho_water_Dean(T0);
-    const double alpha20 = alphaT_water_Dean(T0);
+    const double rho0 = rhoWaterDean(T0);
+    const double alpha20 = alphaTWaterDean(T0);
     return rho0 / (1. + alpha20*(T_Ads-T0));
 }
 
 
 //Thermal expansivity model for water found in the works of Hauer
-double DensityMette::get_alphaT(const double T_Ads) const
+double DensityMette::getAlphaT(const double T_Ads) const
 {
     const double T0 = 293.15;
-    const double alpha20 = alphaT_water_Dean(T0);
+    const double alpha20 = alphaTWaterDean(T0);
     return alpha20 / (1. + alpha20 * (T_Ads-T0));
 }
 
 
 //Characteristic curve. Return W (A)
-double DensityMette::characteristic_curve(const double A) const
+double DensityMette::characteristicCurve(const double A) const
 {
-    double W = curve_polyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(c, A); //cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -58,9 +58,9 @@ double DensityMette::characteristic_curve(const double A) const
     return W/1.e3; //m^3/kg
 }
 
-double DensityMette::d_characteristic_curve(const double A) const
+double DensityMette::dCharacteristicCurve(const double A) const
 {
-    return d_curve_polyfrac(c, A);
+    return dCurvePolyfrac(c, A);
 }
 
 }
diff --git a/MaterialsLib/Adsorption/DensityMette.h b/MaterialsLib/Adsorption/DensityMette.h
index b0aad03078ff62be3b0ee99eb6923d58fbb57bc4..ed7dacfea21b4b08f995a8bf95de3dd682a00080 100644
--- a/MaterialsLib/Adsorption/DensityMette.h
+++ b/MaterialsLib/Adsorption/DensityMette.h
@@ -17,10 +17,10 @@ namespace Adsorption
 class DensityMette : public AdsorptionReaction
 {
 public:
-    double get_adsorbate_density(const double T_Ads) const;
-    double get_alphaT(const double T_Ads) const;
-    double characteristic_curve(const double A) const;
-    double d_characteristic_curve(const double A) const;
+    double getAdsorbateDensity(const double T_Ads) const;
+    double getAlphaT(const double T_Ads) const;
+    double characteristicCurve(const double A) const;
+    double dCharacteristicCurve(const double A) const;
 };
 
 }
diff --git a/MaterialsLib/Adsorption/DensityNunez.cpp b/MaterialsLib/Adsorption/DensityNunez.cpp
index 7c74dfa2ee55b2d91df93624857ef262b8391720..8c3ee491a794fe913b1177f18a0be5aa2eef92a3 100644
--- a/MaterialsLib/Adsorption/DensityNunez.cpp
+++ b/MaterialsLib/Adsorption/DensityNunez.cpp
@@ -29,7 +29,7 @@ const double c[] = {
 namespace Adsorption
 {
 
-double DensityNunez::get_adsorbate_density(const double T_Ads) const
+double DensityNunez::getAdsorbateDensity(const double T_Ads) const
 {
     if (T_Ads < 273.16 || T_Ads > 633.15) {
         // print('Value outside admissible range for rho.');
@@ -45,7 +45,7 @@ double DensityNunez::get_adsorbate_density(const double T_Ads) const
 
 
 //Thermal expansivity model for water found in the works of Hauer
-double DensityNunez::get_alphaT(const double T_Ads) const
+double DensityNunez::getAlphaT(const double T_Ads) const
 {
     if (T_Ads < 273.16 || T_Ads > 633.15) {
         // print('Value outside admissible range for rho.');
@@ -65,9 +65,9 @@ double DensityNunez::get_alphaT(const double T_Ads) const
 
 
 //Characteristic curve. Return W (A)
-double DensityNunez::characteristic_curve(const double A) const
+double DensityNunez::characteristicCurve(const double A) const
 {
-    double W = curve_polyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(c, A); //cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -76,9 +76,9 @@ double DensityNunez::characteristic_curve(const double A) const
     return W/1.e3; //m^3/kg
 }
 
-double DensityNunez::d_characteristic_curve(const double A) const
+double DensityNunez::dCharacteristicCurve(const double A) const
 {
-    return d_curve_polyfrac(c, A);
+    return dCurvePolyfrac(c, A);
 }
 
 }
diff --git a/MaterialsLib/Adsorption/DensityNunez.h b/MaterialsLib/Adsorption/DensityNunez.h
index cce830080070214a74e151b818358bf3dc375297..f122189d0be227cb485e5a9f6276ff4490a92770 100644
--- a/MaterialsLib/Adsorption/DensityNunez.h
+++ b/MaterialsLib/Adsorption/DensityNunez.h
@@ -17,10 +17,10 @@ namespace Adsorption
 class DensityNunez : public AdsorptionReaction
 {
 public:
-    double get_adsorbate_density(const double T_Ads) const;
-    double get_alphaT(const double T_Ads) const;
-    double characteristic_curve(const double A) const;
-    double d_characteristic_curve(const double A) const;
+    double getAdsorbateDensity(const double T_Ads) const;
+    double getAlphaT(const double T_Ads) const;
+    double characteristicCurve(const double A) const;
+    double dCharacteristicCurve(const double A) const;
 };
 
 }
diff --git a/MaterialsLib/Adsorption/Reaction.h b/MaterialsLib/Adsorption/Reaction.h
index 0dd998b9d027fec09f101901396f1bd9190593d9..847d9c1a8daec733befc5d6be09ae38fd0619ce1 100644
--- a/MaterialsLib/Adsorption/Reaction.h
+++ b/MaterialsLib/Adsorption/Reaction.h
@@ -21,12 +21,12 @@ class Reaction
 public:
     static std::unique_ptr<Reaction> newInstance(BaseLib::ConfigTree const& rsys);
 
-    virtual double get_enthalpy(const double p_Ads, const double T_Ads, const double M_Ads) const = 0;
-    virtual double get_reaction_rate(const double p_Ads, const double T_Ads,
+    virtual double getEnthalpy(const double p_Ads, const double T_Ads, const double M_Ads) const = 0;
+    virtual double getReactionRate(const double p_Ads, const double T_Ads,
                                      const double M_Ads, const double loading) const = 0;
 
     // TODO: get rid of
-    virtual double get_equilibrium_loading(const double, const double, const double) const {
+    virtual double getEquilibriumLoading(const double, const double, const double) const {
         return -1.0;
     }
 
diff --git a/MaterialsLib/Adsorption/ReactionCaOH2.cpp b/MaterialsLib/Adsorption/ReactionCaOH2.cpp
index 91b16b710263d3ada13075210cf7c6ddff340037..6e773a2b74cd8b7787c6f337771bb3d923c68ad1 100644
--- a/MaterialsLib/Adsorption/ReactionCaOH2.cpp
+++ b/MaterialsLib/Adsorption/ReactionCaOH2.cpp
@@ -30,13 +30,13 @@ const double ReactionCaOH2::rho_up = 2200.0;
 
 
 double
-ReactionCaOH2::get_enthalpy(const double, const double, const double) const
+ReactionCaOH2::getEnthalpy(const double, const double, const double) const
 {
     return - reaction_enthalpy/M_react;
 }
 
 double
-ReactionCaOH2::get_reaction_rate(const double, const double, const double, const double) const
+ReactionCaOH2::getReactionRate(const double, const double, const double, const double) const
 {
     ERR("get_reaction_rate do not call directly");
     std::abort();
@@ -48,11 +48,11 @@ ReactionCaOH2::get_reaction_rate(const double, const double, const double, const
 double ReactionCaOH2::getReactionRate(double const solid_density)
 {
     rho_s = solid_density;
-    calculate_qR();
+    calculateQR();
     return qR;
 }
 
-void ReactionCaOH2::update_param(
+void ReactionCaOH2::updateParam(
         double T_solid,
         double p_gas,
         double x_react,
@@ -64,20 +64,20 @@ void ReactionCaOH2::update_param(
     rho_s   = rho_s_initial;
 }
 
-void ReactionCaOH2::calculate_qR()
+void ReactionCaOH2::calculateQR()
 {
     //Convert mass fraction into mole fraction
-    // const double mol_frac_react = get_mole_fraction(x_react);
-    const double mol_frac_react = AdsorptionReaction::get_molar_fraction(x_react, M_react, M_carrier);
+    // const double mol_frac_react = getMoleFraction(x_react);
+    const double mol_frac_react = AdsorptionReaction::getMolarFraction(x_react, M_react, M_carrier);
 
     p_r_g = std::max(mol_frac_react * p_gas, 1.0e-3); //avoid illdefined log
-    set_chemical_equilibrium();
-    const double dXdt = Ca_hydration();
+    setChemicalEquilibrium();
+    const double dXdt = CaHydration();
     qR = (rho_up - rho_low) * dXdt;
 }
 
 //determine equilibrium temperature and pressure according to van't Hoff
-void ReactionCaOH2::set_chemical_equilibrium()
+void ReactionCaOH2::setChemicalEquilibrium()
 {
     X_D = (rho_s - rho_up - tol_rho)/(rho_low - rho_up - 2.0*tol_rho) ;
     X_D = (X_D < 0.5) ? std::max(tol_l,X_D) : std::min(X_D,tol_u); //constrain to interval [tol_l;tol_u]
@@ -92,7 +92,7 @@ void ReactionCaOH2::set_chemical_equilibrium()
 }
 
 
-double ReactionCaOH2::Ca_hydration()
+double ReactionCaOH2::CaHydration()
 {
     double dXdt;
         // step 3, calculate dX/dt
diff --git a/MaterialsLib/Adsorption/ReactionCaOH2.h b/MaterialsLib/Adsorption/ReactionCaOH2.h
index 8294f7c48949eadbe30d6883eb2b347e9b723e96..56cd69b1819a255e9ee31faef5657e720b8f399e 100644
--- a/MaterialsLib/Adsorption/ReactionCaOH2.h
+++ b/MaterialsLib/Adsorption/ReactionCaOH2.h
@@ -36,26 +36,26 @@ public:
         }*/
     }
 
-    double get_enthalpy(const double /*p_Ads*/, const double /*T_Ads*/,
+    double getEnthalpy(const double /*p_Ads*/, const double /*T_Ads*/,
                         const double /*M_Ads*/) const override;
 
-    double get_reaction_rate(const double /*p_Ads*/, const double /*T_Ads*/, const double /*M_Ads*/,
+    double getReactionRate(const double /*p_Ads*/, const double /*T_Ads*/, const double /*M_Ads*/,
                              const double /*loading*/) const override;
 
     const BaseLib::ConfigTree& getOdeSolverConfig() const { return ode_solver_config; }
 
-    // TODO merge with get_reaction_rate()
+    // TODO merge with getReactionRate()
     double getReactionRate(double const solid_density);
 
-    void update_param(double T_solid,
+    void updateParam(double T_solid,
                       double p_gas,
                       double x_react,
                       double rho_s_initial);
 
 private:
-    void calculate_qR();
-    void set_chemical_equilibrium();
-    double Ca_hydration();
+    void calculateQR();
+    void setChemicalEquilibrium();
+    double CaHydration();
 
     static const double R;  // [J/mol/K]
     double rho_s;           // solid phase density
diff --git a/MaterialsLib/Adsorption/ReactionInert.h b/MaterialsLib/Adsorption/ReactionInert.h
index 4ab79734a94dde89b5766704692b4d855ea858f2..5f1e1e37bda59272fc4a2d4a71468ea009a72e50 100644
--- a/MaterialsLib/Adsorption/ReactionInert.h
+++ b/MaterialsLib/Adsorption/ReactionInert.h
@@ -17,16 +17,16 @@ namespace Adsorption
 class ReactionInert final : public Reaction
 {
 public:
-    double get_enthalpy(const double /*p_Ads*/, const double /*T_Ads*/,
+    double getEnthalpy(const double /*p_Ads*/, const double /*T_Ads*/,
                         const double /*M_Ads*/) const override
     {
         return 0.0;
     }
 
-    double get_reaction_rate(const double /*p_Ads*/, const double /*T_Ads*/, const double /*M_Ads*/,
+    double getReactionRate(const double /*p_Ads*/, const double /*T_Ads*/, const double /*M_Ads*/,
                              const double /*loading*/) const override
     {
-        ERR("Method get_reaction_rate() should never be called directly");
+        ERR("Method getReactionRate() should never be called directly");
         std::abort();
         return 0.0;
     }
diff --git a/MaterialsLib/Adsorption/ReactionSinusoidal.h b/MaterialsLib/Adsorption/ReactionSinusoidal.h
index 9173cac5753466dd6f15e3107815040f626a0742..942142803a9f6011143a20e66595f308c6ceb8f9 100644
--- a/MaterialsLib/Adsorption/ReactionSinusoidal.h
+++ b/MaterialsLib/Adsorption/ReactionSinusoidal.h
@@ -25,16 +25,16 @@ public:
     {
     }
 
-    double get_enthalpy(const double /*p_Ads*/, const double /*T_Ads*/,
+    double getEnthalpy(const double /*p_Ads*/, const double /*T_Ads*/,
                         const double /*M_Ads*/) const override
     {
         return _enthalpy;
     }
 
-    double get_reaction_rate(const double /*p_Ads*/, const double /*T_Ads*/, const double /*M_Ads*/,
+    double getReactionRate(const double /*p_Ads*/, const double /*T_Ads*/, const double /*M_Ads*/,
                              const double /*loading*/) const override
     {
-        ERR("Method get_reaction_rate() should never be called directly");
+        ERR("Method getReactionRate() should never be called directly");
         std::abort();
         return 0.0;
     }