diff --git a/Core/Export/MaterialKeyHandler.cpp b/Core/Export/MaterialKeyHandler.cpp
index 798c70312bc9513a6603e9c64bdd04a21de2f20f..3c530d857b54fcfbfe3b52b24c9d2ec0840cc5db 100644
--- a/Core/Export/MaterialKeyHandler.cpp
+++ b/Core/Export/MaterialKeyHandler.cpp
@@ -28,10 +28,10 @@ void MaterialKeyHandler::insertMaterial(const Material* mat)
         }
     m_Mat2Unique.emplace(mat, mat);
 
-    const std::string key = "material_" + mat->getName();
+    const std::string key = "material_" + mat->materialName();
     if (m_Key2Mat.count(key))
         throw std::runtime_error(
-            "Material name " + mat->getName()
+            "Material name " + mat->materialName()
             + " used more than once, which is not supported by Python exporter");
     m_Key2Mat.emplace(key, mat);
 }
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index 2334de35386ac8c3f2cc320e89aab90856ddaa57..287119ace531e488a6d286c3c54221312d56671d 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -172,7 +172,7 @@ std::string SampleToPython::defineMaterials() const
         const complex_t& material_data = p_material->materialData();
         if (p_material->isScalarMaterial()) {
             result << indent() << m_materials->mat2key(p_material) << " = ba."
-                   << factory_name->second << "(\"" << p_material->getName() << "\", "
+                   << factory_name->second << "(\"" << p_material->materialName() << "\", "
                    << Py::Fmt::printDouble(material_data.real()) << ", "
                    << Py::Fmt::printDouble(material_data.imag()) << ")\n";
         } else {
@@ -180,7 +180,7 @@ std::string SampleToPython::defineMaterials() const
             result << indent() << "magnetic_field = R3(" << magnetic_field.x() << ", "
                    << magnetic_field.y() << ", " << magnetic_field.z() << ")\n";
             result << indent() << m_materials->mat2key(p_material) << " = ba."
-                   << factory_name->second << "(\"" << p_material->getName();
+                   << factory_name->second << "(\"" << p_material->materialName();
             result << "\", " << Py::Fmt::printDouble(material_data.real()) << ", "
                    << Py::Fmt::printDouble(material_data.imag()) << ", "
                    << "magnetic_field)\n";
diff --git a/Fit/Param/RealLimits.cpp b/Fit/Param/RealLimits.cpp
index 1beeed1ebf487ef406808ca69c69b5e5901a7ea9..3d577ae9885456437a806dfaab1846aa96bca698 100644
--- a/Fit/Param/RealLimits.cpp
+++ b/Fit/Param/RealLimits.cpp
@@ -162,8 +162,8 @@ void RealLimits::check(const std::string& name, const double value) const
 {
     if (!isInRange(value)) {
         std::ostringstream message;
-        message << "Parameter " << name << ": value " << value
-                << " is out of bounds [" << *this << "]\n";
+        message << "Parameter " << name << ": value " << value << " is out of bounds [" << *this
+                << "]\n";
         throw std::runtime_error(message.str());
     }
 }
diff --git a/GUI/Models/GUIDomainSampleVisitor.cpp b/GUI/Models/GUIDomainSampleVisitor.cpp
index ca793e35f69f7b25cb206afa405f5c1b6d650230..91b1ba0cba524d58c8118ca6041be03e1f3f3197 100644
--- a/GUI/Models/GUIDomainSampleVisitor.cpp
+++ b/GUI/Models/GUIDomainSampleVisitor.cpp
@@ -557,7 +557,8 @@ void GUIDomainSampleVisitor::visit(const RotationEuler* sample)
 
 MaterialItem* GUIDomainSampleVisitor::createMaterialFromDomain(const Material* material)
 {
-    QString materialName = m_topSampleName + QString("_") + QString(material->getName().c_str());
+    QString materialName =
+        m_topSampleName + QString("_") + QString(material->materialName().c_str());
 
     if (auto materialItem = m_materialModel->materialFromName(materialName))
         return materialItem;
diff --git a/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp b/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
index 9014cc1f2691a77ec95402a1caeed2f7c74d6f90..129a834dd023df7944057c7df6fb2f755e7925fe 100644
--- a/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
+++ b/GUI/Views/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
@@ -192,7 +192,7 @@ void GUI::RealSpace::BuilderUtils::applyParticleColor(
 {
     // assign correct color to the particle from the knowledge of its material
     const Material* particle_material = particle.material();
-    QString material_name = QString::fromStdString(particle_material->getName());
+    QString material_name = QString::fromStdString(particle_material->materialName());
     auto materialItem =
         GUI::Model::MaterialModelStore::materialModel()->materialFromName(material_name);
     QColor color = materialItem->color();
diff --git a/Param/Distrib/ParameterDistribution.h b/Param/Distrib/ParameterDistribution.h
index c92371cccc9bf16f70efed315a3643916eea445e..fa3bac9258342071771a0b3e1a49a4743af956e7 100644
--- a/Param/Distrib/ParameterDistribution.h
+++ b/Param/Distrib/ParameterDistribution.h
@@ -16,8 +16,8 @@
 #define BORNAGAIN_PARAM_DISTRIB_PARAMETERDISTRIBUTION_H
 
 #include "Fit/Param/RealLimits.h"
-#include "Param/Node/INamed.h"
 #include "Param/Distrib/ParameterSample.h"
+#include "Param/Node/INamed.h"
 #include <memory>
 #include <vector>
 
diff --git a/Resample/Processed/ProcessedSample.cpp b/Resample/Processed/ProcessedSample.cpp
index 26ae76d940a416b103305600f622f6b2bf80d219..f9014c64d21047b1b0d4bdfce277ae7f8bf0e236 100644
--- a/Resample/Processed/ProcessedSample.cpp
+++ b/Resample/Processed/ProcessedSample.cpp
@@ -52,7 +52,7 @@ T averageData(const Material& layer_mat, const Admixtures& admixtures,
 
 Material createAveragedMaterial(const Material& layer_mat, const Admixtures& admixtures)
 {
-    const std::string avge_name = layer_mat.getName() + "_avg";
+    const std::string avge_name = layer_mat.materialName() + "_avg";
 
     const R3 avge_magnetization = averageData<R3>(
         layer_mat, admixtures, [](const Material& mat) { return mat.magnetization(); });
diff --git a/Sample/Lattice/Lattice2D.cpp b/Sample/Lattice/Lattice2D.cpp
index fcd988b968011eb7419e37cd0bd8a0e2a7a58db6..2c1d3f730348cfc7d22d6bba3b76e3ef0f2ca8e0 100644
--- a/Sample/Lattice/Lattice2D.cpp
+++ b/Sample/Lattice/Lattice2D.cpp
@@ -26,9 +26,7 @@ Lattice2D::Lattice2D(const NodeMeta& meta, const std::vector<double>& PValues)
 {
 }
 
-Lattice2D::Lattice2D(double xi) : m_xi(xi)
-{
-}
+Lattice2D::Lattice2D(double xi) : m_xi(xi) {}
 
 Lattice2D::ReciprocalBases Lattice2D::reciprocalBases() const
 {
diff --git a/Sample/Material/BaseMaterialImpl.h b/Sample/Material/BaseMaterialImpl.h
index 6bee753fc0d6a95f3a2dd50a65e1f0fe3f0e6444..063bf41738ca09f30f77b56c5e649ee85e89a75a 100644
--- a/Sample/Material/BaseMaterialImpl.h
+++ b/Sample/Material/BaseMaterialImpl.h
@@ -78,7 +78,7 @@ public:
     virtual void print(std::ostream& ostr) const = 0;
 
     //! Returns name of the material
-    const std::string& getName() const { return m_name; }
+    const std::string& matName() const { return m_name; }
 
 private:
     const std::string m_name;
diff --git a/Sample/Material/MagneticMaterialImpl.cpp b/Sample/Material/MagneticMaterialImpl.cpp
index d4f0a5ab3d8bd11915fdfe3b89c7066f80ab3b2c..29a8f0d838961ab614a59363c048eb51debc19e4 100644
--- a/Sample/Material/MagneticMaterialImpl.cpp
+++ b/Sample/Material/MagneticMaterialImpl.cpp
@@ -45,7 +45,7 @@ MagneticMaterialImpl::MagneticMaterialImpl(const std::string& name, R3 magnetiza
 
 MagneticMaterialImpl* MagneticMaterialImpl::inverted() const
 {
-    std::string name = isScalarMaterial() ? getName() : getName() + "_inv";
+    std::string name = isScalarMaterial() ? matName() : matName() + "_inv";
     MagneticMaterialImpl* result = this->clone();
     result->setMagnetization(-magnetization());
     return result;
diff --git a/Sample/Material/Material.cpp b/Sample/Material/Material.cpp
index e1989828c309857698397620410962eacf985c67..85d271cbdc858a0c4c06b58d8a395730986f67a1 100644
--- a/Sample/Material/Material.cpp
+++ b/Sample/Material/Material.cpp
@@ -63,9 +63,9 @@ bool Material::isMagneticMaterial() const
     return m_material_impl->isMagneticMaterial();
 }
 
-std::string Material::getName() const
+std::string Material::materialName() const
 {
-    return m_material_impl->getName();
+    return m_material_impl->matName();
 }
 
 MATERIAL_TYPES Material::typeID() const
@@ -112,7 +112,7 @@ std::ostream& operator<<(std::ostream& ostr, const Material& m)
 
 bool operator==(const Material& left, const Material& right)
 {
-    if (left.getName() != right.getName())
+    if (left.materialName() != right.materialName())
         return false;
     if (left.magnetization() != right.magnetization())
         return false;
diff --git a/Sample/Material/Material.h b/Sample/Material/Material.h
index 2fbc2c2490aac341aa92395045da6c54d634f601..6ec6c56b2b2f9734dfa926ee9ff0104426121e1c 100644
--- a/Sample/Material/Material.h
+++ b/Sample/Material/Material.h
@@ -58,7 +58,7 @@ public:
     bool isMagneticMaterial() const;
 
     //! Returns the name of material
-    std::string getName() const;
+    std::string materialName() const;
 
 #ifndef SWIG
     //! Returns the type of underlying material implementation
diff --git a/Sample/Material/MaterialBySLDImpl.cpp b/Sample/Material/MaterialBySLDImpl.cpp
index cdb5887b07f025dd6fa7d052bb264e58214a91bb..0fab576ba602063be7b5327a061f53b13c5b06c4 100644
--- a/Sample/Material/MaterialBySLDImpl.cpp
+++ b/Sample/Material/MaterialBySLDImpl.cpp
@@ -62,7 +62,7 @@ complex_t MaterialBySLDImpl::scalarSubtrSLD(double lambda0) const
 
 void MaterialBySLDImpl::print(std::ostream& ostr) const
 {
-    ostr << "MaterialBySLD:" << getName() << "<" << this << ">{ "
+    ostr << "MaterialBySLD:" << matName() << "<" << this << ">{ "
          << "sld_real=" << m_sld_real << ", sld_imag = " << m_sld_imag << ", B=" << magnetization()
          << "}";
 }
diff --git a/Sample/Material/RefractiveMaterialImpl.cpp b/Sample/Material/RefractiveMaterialImpl.cpp
index e1548e80e3cad08368445f8c18515cec66934ab5..a325691ba4769d73f4be3e97f74857d77d39ff9b 100644
--- a/Sample/Material/RefractiveMaterialImpl.cpp
+++ b/Sample/Material/RefractiveMaterialImpl.cpp
@@ -53,6 +53,6 @@ complex_t RefractiveMaterialImpl::scalarSubtrSLD(double lambda0) const
 
 void RefractiveMaterialImpl::print(std::ostream& ostr) const
 {
-    ostr << "RefractiveMaterial:" << getName() << "<" << this << ">{ "
+    ostr << "RefractiveMaterial:" << matName() << "<" << this << ">{ "
          << "delta=" << m_delta << ", beta=" << m_beta << ", B=" << magnetization() << "}";
 }
diff --git a/Sample/StandardSamples/RipplesBuilder.cpp b/Sample/StandardSamples/RipplesBuilder.cpp
index 22e8ec1cbac2389f113bc7b0268459c50fa97fc9..92ed48bce79507ccf9035497a1455a7facdc0884 100644
--- a/Sample/StandardSamples/RipplesBuilder.cpp
+++ b/Sample/StandardSamples/RipplesBuilder.cpp
@@ -49,9 +49,7 @@ MultiLayer* CosineRippleBuilder::buildSample() const
 
 // ----------------------------------------------------------------------------
 
-TriangularRippleBuilder::TriangularRippleBuilder(double d) : m_d(d)
-{
-}
+TriangularRippleBuilder::TriangularRippleBuilder(double d) : m_d(d) {}
 
 MultiLayer* TriangularRippleBuilder::buildSample() const
 {
diff --git a/Tests/Unit/Param/IParameterizedTest.cpp b/Tests/Unit/Param/IParameterizedTest.cpp
index 0a774cddd438362545ebf0e07c775e056989a505..34a915b60e798375a73073ebfd7f92553d7e2d07 100644
--- a/Tests/Unit/Param/IParameterizedTest.cpp
+++ b/Tests/Unit/Param/IParameterizedTest.cpp
@@ -2,7 +2,8 @@
 #include "Tests/GTestWrapper/google_test.h"
 #include <stdexcept>
 
-class INamedTest : public ::testing::Test {};
+class INamedTest : public ::testing::Test {
+};
 
 TEST_F(INamedTest, checkLimits)
 {
diff --git a/Tests/Unit/Param/RangedDistributionTest.cpp b/Tests/Unit/Param/RangedDistributionTest.cpp
index 87a687c994110e1e525960a4831f224840d3208e..6f333c8af87b805831a5c47003fedecdf4f95764 100644
--- a/Tests/Unit/Param/RangedDistributionTest.cpp
+++ b/Tests/Unit/Param/RangedDistributionTest.cpp
@@ -1,6 +1,6 @@
 #include "Param/Distrib/Distributions.h"
-#include "Param/Distrib/RangedDistributions.h"
 #include "Param/Distrib/ParameterSample.h"
+#include "Param/Distrib/RangedDistributions.h"
 #include "Tests/GTestWrapper/google_test.h"
 
 class RangedDistributionTest : public ::testing::Test {
diff --git a/auto/Wrap/doxygenSample.i b/auto/Wrap/doxygenSample.i
index 8676154561192f7aae33ec5ab3fb7458616bf0da..41bff364a0d1462359709bdfb1708120934ec1b6 100644
--- a/auto/Wrap/doxygenSample.i
+++ b/auto/Wrap/doxygenSample.i
@@ -114,7 +114,7 @@ Returns (  $ \\\\pi/\\\\lambda^2 $ - sld) matrix with magnetization corrections.
 Prints object data. 
 ";
 
-%feature("docstring")  BaseMaterialImpl::getName "const std::string& BaseMaterialImpl::getName() const
+%feature("docstring")  BaseMaterialImpl::matName "const std::string& BaseMaterialImpl::matName() const
 
 Returns name of the material. 
 ";
@@ -4865,7 +4865,7 @@ Indicates whether the interaction with the material is scalar. This means that d
 %feature("docstring")  Material::isMagneticMaterial "bool Material::isMagneticMaterial() const
 ";
 
-%feature("docstring")  Material::getName "std::string Material::getName() const
+%feature("docstring")  Material::materialName "std::string Material::materialName() const
 
 Returns the name of material. 
 ";
diff --git a/auto/Wrap/libBornAgainSample.py b/auto/Wrap/libBornAgainSample.py
index 8684f31155be7bf6c70e328de39e7c19fc266788..71e16aa17b50e4d94b33d78ba5b212275a1b1430 100644
--- a/auto/Wrap/libBornAgainSample.py
+++ b/auto/Wrap/libBornAgainSample.py
@@ -2816,15 +2816,15 @@ class Material(object):
         """
         return _libBornAgainSample.Material_isMagneticMaterial(self)
 
-    def getName(self):
+    def materialName(self):
         r"""
-        getName(Material self) -> std::string
-        std::string Material::getName() const
+        materialName(Material self) -> std::string
+        std::string Material::materialName() const
 
         Returns the name of material. 
 
         """
-        return _libBornAgainSample.Material_getName(self)
+        return _libBornAgainSample.Material_materialName(self)
 
     def magnetization(self):
         r"""
diff --git a/auto/Wrap/libBornAgainSample_wrap.cpp b/auto/Wrap/libBornAgainSample_wrap.cpp
index 31c673bcd82ea0283a8ca000a42e9e4bf265d9e7..3b96674f57dcdccb9cdd242db8703508adf9803c 100644
--- a/auto/Wrap/libBornAgainSample_wrap.cpp
+++ b/auto/Wrap/libBornAgainSample_wrap.cpp
@@ -36506,7 +36506,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Material_materialName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Material *arg1 = (Material *) 0 ;
   void *argp1 = 0 ;
@@ -36518,10 +36518,10 @@ SWIGINTERN PyObject *_wrap_Material_getName(PyObject *SWIGUNUSEDPARM(self), PyOb
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_getName" "', argument " "1"" of type '" "Material const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_materialName" "', argument " "1"" of type '" "Material const *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
-  result = ((Material const *)arg1)->getName();
+  result = ((Material const *)arg1)->materialName();
   resultobj = SWIG_From_std_string(static_cast< std::string >(result));
   return resultobj;
 fail:
@@ -67820,9 +67820,9 @@ static PyMethodDef SwigMethods[] = {
 		"bool Material::isMagneticMaterial() const\n"
 		"\n"
 		""},
-	 { "Material_getName", _wrap_Material_getName, METH_O, "\n"
-		"Material_getName(Material self) -> std::string\n"
-		"std::string Material::getName() const\n"
+	 { "Material_materialName", _wrap_Material_materialName, METH_O, "\n"
+		"Material_materialName(Material self) -> std::string\n"
+		"std::string Material::materialName() const\n"
 		"\n"
 		"Returns the name of material. \n"
 		"\n"