diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 667e2f02b6e1f3a8f076f05f13881ca8160e38b4..bbfe5babb8508884015adee7a3f59e858c6c085d 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -459,7 +459,7 @@ void JobItem::writeTo(QXmlStreamWriter* writer) const
 
     // sample
     writer->writeStartElement(Tag::Sample);
-    m_sampleItem->writeContentTo(writer);
+    m_sampleItem->writeTo(writer);
     writer->writeEndElement();
 
     // parameters
@@ -572,7 +572,7 @@ void JobItem::readFrom(QXmlStreamReader* reader)
 
             // sample
         } else if (reader->name() == Tag::Sample) {
-            m_sampleItem->readContentFrom(reader);
+            m_sampleItem->readFrom(reader);
             GUI::Session::XML::gotoEndElementOfTag(reader, Tag::Sample);
 
             // activity
diff --git a/GUI/Model/Model/ParameterTreeUtils.cpp b/GUI/Model/Model/ParameterTreeUtils.cpp
index 4c1f9995966a90640935ce2498d4a17c9f4da413..3522450bdb5f4044196cbb223fb7e9caebdd1eb4 100644
--- a/GUI/Model/Model/ParameterTreeUtils.cpp
+++ b/GUI/Model/Model/ParameterTreeUtils.cpp
@@ -102,7 +102,7 @@ void ParameterTreeBuilder::addMaterials()
         }
 
         if (allowMagneticFields())
-            addParameterItem(label, item->magnetizationVector());
+            addParameterItem(label, item->magnetization());
     }
 }
 
diff --git a/GUI/Model/Sample/MaterialItem.h b/GUI/Model/Sample/MaterialItem.h
index b44d4c127225d7141e7285bf2e974f56acd67f4d..099a20aff8d679356f69d192ffcd9879db055131 100644
--- a/GUI/Model/Sample/MaterialItem.h
+++ b/GUI/Model/Sample/MaterialItem.h
@@ -63,9 +63,8 @@ public:
     DoubleProperty& sldIm();
     const DoubleProperty& sldIm() const;
 
-    VectorProperty& magnetizationVector() { return m_magnetization; }
-    const VectorProperty& magnetizationVector() const { return m_magnetization; }
-    R3 magnetization() const { return m_magnetization; }
+    VectorProperty& magnetization() { return m_magnetization; }
+    const VectorProperty& magnetization() const { return m_magnetization; }
     void setMagnetization(const R3& magnetization);
 
     /// \return true if refractive index was given, otherwise SLD was given
diff --git a/GUI/Model/Sample/MultiLayerItem.cpp b/GUI/Model/Sample/MultiLayerItem.cpp
index 32a371ce4b1c77290e9c32ec6529e6d4fa7cdc62..37f5c4bf3615f2f0cd6037ddc877ccc5119bc49f 100644
--- a/GUI/Model/Sample/MultiLayerItem.cpp
+++ b/GUI/Model/Sample/MultiLayerItem.cpp
@@ -102,13 +102,13 @@ void MultiLayerItem::moveLayer(LayerItem* layer, LayerItem* beforeThisLayer)
     }
 }
 
-void MultiLayerItem::writeContentTo(QXmlStreamWriter* writer) const
+void MultiLayerItem::writeTo(QXmlStreamWriter* writer) const
 {
     Streamer s(writer);
     const_cast<MultiLayerItem*>(this)->serialize(s);
 }
 
-void MultiLayerItem::readContentFrom(QXmlStreamReader* reader)
+void MultiLayerItem::readFrom(QXmlStreamReader* reader)
 {
     Streamer s(reader);
     serialize(s);
diff --git a/GUI/Model/Sample/MultiLayerItem.h b/GUI/Model/Sample/MultiLayerItem.h
index f55205b073a3ede0d882d0e030fe0cf7edfc3e90..63f578ed80b317be784d00e457e6d9b66bc1af05 100644
--- a/GUI/Model/Sample/MultiLayerItem.h
+++ b/GUI/Model/Sample/MultiLayerItem.h
@@ -63,8 +63,8 @@ public:
     void removeLayer(LayerItem* item);
     void moveLayer(LayerItem* item, LayerItem* beforeThisLayer);
 
-    void writeContentTo(QXmlStreamWriter* writer) const;
-    void readContentFrom(QXmlStreamReader* reader);
+    void writeTo(QXmlStreamWriter* writer) const;
+    void readFrom(QXmlStreamReader* reader);
     void serialize(Streamer& s);
 
     MaterialItems& materialItems() { return m_materials; }
diff --git a/GUI/Model/Sample/ProfileItems.cpp b/GUI/Model/Sample/ProfileItems.cpp
index b8d8deb42f9aeeb5047642b42df7a74a60108d89..e86cc95f8f71de7035cdf84891a1afa3f0040b20 100644
--- a/GUI/Model/Sample/ProfileItems.cpp
+++ b/GUI/Model/Sample/ProfileItems.cpp
@@ -84,7 +84,7 @@ std::unique_ptr<IProfile1D> Profile1DCosineItem::createProfile() const
 Profile1DVoigtItem::Profile1DVoigtItem()
 {
     m_eta.init("Eta", "Parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)",
-               0.5, Unit::unitless, 3, RealLimits::limited(0.0, 1.0), "eta");
+               0.5, Unit::unitless, 3 /* decimals */, RealLimits::limited(0.0, 1.0), "eta");
 }
 
 std::unique_ptr<IProfile1D> Profile1DVoigtItem::createProfile() const
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 3609e91ca01fab6a3cdf7ec9e9e1352eb6b57660..17dd9b0361bbc3800b8037eedea500312f3066ac 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -112,7 +112,7 @@ void MaterialInplaceForm::createWidgets()
     }
 
     // -- Create UI for magnetization vector
-    VectorProperty mag = material->magnetizationVector();
+    VectorProperty mag = material->magnetization();
     const auto setNewValue = [=](double value, DoubleDescriptor d) {
         m_ec->setMaterialValue(m_item, value, d);
     };
diff --git a/Tests/Unit/GUI/TestMaterialItems.cpp b/Tests/Unit/GUI/TestMaterialItems.cpp
index 5b8f1a1026d64482d087d0fbbb4cd868c8f7e65f..079c99e7cdafc77fd2345241ca1bc16dffa82142 100644
--- a/Tests/Unit/GUI/TestMaterialItems.cpp
+++ b/Tests/Unit/GUI/TestMaterialItems.cpp
@@ -156,7 +156,7 @@ TEST_F(TestMaterialItems, serializeRefractiveMaterial)
     EXPECT_TRUE(target.hasRefractiveIndex());
     EXPECT_EQ(target.delta(), 11);
     EXPECT_EQ(target.beta(), 12);
-    EXPECT_EQ(target.magnetization(), R3(1, 2, 3));
+    EXPECT_EQ(target.magnetization().r3(), R3(1, 2, 3));
 }
 
 TEST_F(TestMaterialItems, serializeSLDMaterial)
@@ -179,5 +179,5 @@ TEST_F(TestMaterialItems, serializeSLDMaterial)
     EXPECT_FALSE(target.hasRefractiveIndex());
     EXPECT_EQ(target.sldRe(), 11);
     EXPECT_EQ(target.sldIm(), 12);
-    EXPECT_EQ(target.magnetization(), R3(1, 2, 3));
+    EXPECT_EQ(target.magnetization().r3(), R3(1, 2, 3));
 }