diff --git a/GUI/Models/BeamItems.cpp b/GUI/Models/BeamItems.cpp
index d29db9565c082e82cea9fd38f9457a3b01e0f04a..4f24fba9db4bd51239b1f11897a250a554812134 100644
--- a/GUI/Models/BeamItems.cpp
+++ b/GUI/Models/BeamItems.cpp
@@ -156,7 +156,7 @@ SpecularBeamItem::SpecularBeamItem() : BeamItem(M_TYPE)
         [this](SessionItem*, QString property) {
             if (!SymmetricDistributionItem::isMeanPropertyName(property))
                 return;
-            if (auto axis_item = dynamic_cast<PointwiseAxisItem*>(currentInclinationAxisItem()))
+            if (auto axis_item = dynamic_cast<PointwiseAxisItem*>(inclinationAxis()))
                 axis_item->updateIndicators();
         },
         this);
@@ -188,12 +188,12 @@ GroupItem* SpecularBeamItem::inclinationAxisGroup() const
     return inclinationAngleItem()->alphaAxisItem();
 }
 
-BasicAxisItem* SpecularBeamItem::currentInclinationAxisItem() const
+BasicAxisItem* SpecularBeamItem::inclinationAxis() const
 {
     return dynamic_cast<BasicAxisItem*>(inclinationAxisGroup()->currentItem());
 }
 
-FootprintItem* SpecularBeamItem::currentFootprintItem() const
+FootprintItem* SpecularBeamItem::footprint() const
 {
     return &groupItem<FootprintItem>(P_FOOTPRINT);
 }
@@ -223,7 +223,7 @@ void SpecularBeamItem::updateToData(const IAxis& axis, QString units) const
 {
     if (units == "nbins") {
         inclinationAxisGroup()->setCurrentType(BasicAxisItem::M_TYPE);
-        auto axis_item = currentInclinationAxisItem();
+        auto axis_item = inclinationAxis();
         axis_item->setBinCount(static_cast<int>(axis.size()));
         return;
     }
diff --git a/GUI/Models/BeamItems.h b/GUI/Models/BeamItems.h
index e5e34c3ec46a55413fab013f30fa922566de3bad..8a07a5bc7628fe6ac1660336589f2d767198f760 100644
--- a/GUI/Models/BeamItems.h
+++ b/GUI/Models/BeamItems.h
@@ -79,9 +79,9 @@ public:
     void setInclinationAngle(double value) override;
     SpecularBeamInclinationItem* inclinationAngleItem() const override;
     GroupItem* inclinationAxisGroup() const;
-    BasicAxisItem* currentInclinationAxisItem() const;
+    BasicAxisItem* inclinationAxis() const;
 
-    FootprintItem* currentFootprintItem() const;
+    FootprintItem* footprint() const;
     void setGaussianFootprint(double value);
     void setSquareFootprint(double value);
     SessionItem* footprintGroupItem() const;
diff --git a/GUI/Models/DomainSimulationBuilder.cpp b/GUI/Models/DomainSimulationBuilder.cpp
index a97244888ec4a4d07101d60e1db68f3f69d25434..ec886b53fdf96eaf35c19a2be4efda7e5eb068d8 100644
--- a/GUI/Models/DomainSimulationBuilder.cpp
+++ b/GUI/Models/DomainSimulationBuilder.cpp
@@ -94,8 +94,8 @@ createSpecularSimulation(std::unique_ptr<MultiLayer> P_multilayer,
     ret->setSample(*P_multilayer);
 
     auto beam_item = instrument->beamItem();
-    const auto axis_item = beam_item->currentInclinationAxisItem();
-    const auto footprint = beam_item->currentFootprintItem();
+    const auto axis_item = beam_item->inclinationAxis();
+    const auto footprint = beam_item->footprint();
 
     AlphaScan scan(beam_item->wavelength(), *axis_item->createAxis(Units::deg));
     scan.setFootprintFactor(footprint->createFootprint().get());
diff --git a/GUI/Models/InstrumentItems.cpp b/GUI/Models/InstrumentItems.cpp
index 2089054ec1bfa2a991f105e293473affbe9f1050..053820686c8e04cb476cd93a67ce690432bf51ca 100644
--- a/GUI/Models/InstrumentItems.cpp
+++ b/GUI/Models/InstrumentItems.cpp
@@ -232,7 +232,7 @@ SpecularInstrumentItem::~SpecularInstrumentItem() = default;
 
 std::vector<int> SpecularInstrumentItem::shape() const
 {
-    const auto axis_item = beamItem()->currentInclinationAxisItem();
+    const auto axis_item = beamItem()->inclinationAxis();
     return {axis_item->binCount()};
 }
 
@@ -250,10 +250,10 @@ bool SpecularInstrumentItem::alignedWith(const RealDataItem* item) const
 {
     const QString native_units = item->nativeDataUnits();
     if (native_units == "nbins") {
-        return beamItem()->currentInclinationAxisItem()->modelType() == BasicAxisItem::M_TYPE
+        return beamItem()->inclinationAxis()->modelType() == BasicAxisItem::M_TYPE
                && shape() == item->shape();
     }
-    auto axis_item = dynamic_cast<PointwiseAxisItem*>(beamItem()->currentInclinationAxisItem());
+    auto axis_item = dynamic_cast<PointwiseAxisItem*>(beamItem()->inclinationAxis());
     if (!axis_item)
         return false;
     if (axis_item->getUnitsLabel() != native_units)
@@ -275,7 +275,7 @@ ICoordSystem* SpecularInstrumentItem::createCoordSystem() const
     std::unique_ptr<Instrument> instrument(new Instrument);
     instrument->setBeam(*beamItem()->createBeam());
     // \todo setPolFilters ?
-    auto axis_item = beamItem()->currentInclinationAxisItem();
+    auto axis_item = beamItem()->inclinationAxis();
     if (auto pointwise_axis = dynamic_cast<PointwiseAxisItem*>(axis_item)) {
         if (!pointwise_axis->containsNonXMLData()) // workaround for loading project
             return nullptr;
@@ -302,7 +302,7 @@ DepthProbeInstrumentItem::DepthProbeInstrumentItem() : InstrumentItem(M_TYPE)
 {
     addBeam<SpecularBeamItem>();
 
-    auto axisItem = beamItem()->currentInclinationAxisItem();
+    auto axisItem = beamItem()->inclinationAxis();
     axisItem->setLowerBound(0.0);
     axisItem->setUpperBound(1.0);
     axisItem->setBinCount(500);
@@ -340,7 +340,7 @@ std::unique_ptr<DepthProbeSimulation> DepthProbeInstrumentItem::createSimulation
 {
     std::unique_ptr<DepthProbeSimulation> simulation = std::make_unique<DepthProbeSimulation>();
 
-    const auto axis_item = beamItem()->currentInclinationAxisItem();
+    const auto axis_item = beamItem()->inclinationAxis();
 
     auto axis = axis_item->createAxis(Units::deg);
 
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index 419bfd3222ed03a51e14a797768011517f6f77a0..54ec8532472cd5dd56c49e754bde052d4f3b3675 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -470,7 +470,7 @@ void GUI::Transform::FromDomain::setSpecularBeamItem(SpecularBeamItem* beam_item
     beam_item->setInclinationAngle(0.0); // inclination angle is hardcoded
     beam_item->setAzimuthalAngle(0.0);   // azimuthal angle is hardcoded
 
-    auto axis_item = beam_item->currentInclinationAxisItem();
+    auto axis_item = beam_item->inclinationAxis();
     GUI::Transform::FromDomain::setAxisItem(axis_item, *simulation.coordinateAxis(),
                                             1. / Units::deg);
 
diff --git a/GUI/Views/InstrumentWidgets/FootprintCorrectionEditor.cpp b/GUI/Views/InstrumentWidgets/FootprintCorrectionEditor.cpp
index c697da7e93a4b538e2e0a21f404476b60dc210ec..ac3509a1139828102c79bf156f57ba48e8db4fa9 100644
--- a/GUI/Views/InstrumentWidgets/FootprintCorrectionEditor.cpp
+++ b/GUI/Views/InstrumentWidgets/FootprintCorrectionEditor.cpp
@@ -182,11 +182,11 @@ void FootprintCorrectionEditor::setItem(SpecularBeamItem* item)
     m_item = item;
     setEnabled(m_item);
     if (m_item) {
-        int idx = m_combo->findData(m_item->currentFootprintItem()->modelType());
+        int idx = m_combo->findData(m_item->footprint()->modelType());
         ASSERT(idx != -1);
         if (idx != m_combo->currentIndex())
             m_combo->setCurrentIndex(idx);
-        else if (!m_item->currentFootprintItem()->hasModelType<FootprintNoneItem>())
+        else if (!m_item->footprint()->hasModelType<FootprintNoneItem>())
             onFootprintSelected(idx); // trigger update manually
     }
 }