diff --git a/DualDipoleAntenna.cc b/DualDipoleAntenna.cc
index 89985fe35cecf2fc1fcca8de8f9ed3f27ba1936b..a327867e66de456a78e10758320cb850ad42992e 100644
--- a/DualDipoleAntenna.cc
+++ b/DualDipoleAntenna.cc
@@ -41,12 +41,12 @@ matrix22c_t DualDipoleAntenna::response(real_t freq,
     vector2r_t thetaphi = cart2thetaphi(direction);
     thetaphi[1] -= 5.0 * Constants::pi_4;
     matrix22c_t response;
-    m_element_response->element_response(freq, thetaphi[0], thetaphi[1],
+    itsElementResponse->element_response(freq, thetaphi[0], thetaphi[1],
         reinterpret_cast<std::complex<double> (&)[2][2]>(response));
     return response;
 }
 
-std::unique_ptr<ElementResponse> DualDipoleAntenna::m_element_response = nullptr;
+std::unique_ptr<ElementResponse> DualDipoleAntenna::itsElementResponse = nullptr;
 
 } //# namespace StationResponse
 } //# namespace LOFAR
diff --git a/DualDipoleAntenna.h b/DualDipoleAntenna.h
index a51b420dfb00324e9e6cb4a5cd6433ba520cfec2..3bed6af0f6fc5a6415aa694bcb2c955727a2a4b2 100644
--- a/DualDipoleAntenna.h
+++ b/DualDipoleAntenna.h
@@ -52,7 +52,7 @@ public:
     virtual matrix22c_t response(real_t freq, const vector3r_t &direction)
         const final override;
 
-    static std::unique_ptr<ElementResponse> m_element_response;
+    static std::unique_ptr<ElementResponse> itsElementResponse;
 };
 
 // @}
diff --git a/Station.cc b/Station.cc
index 6c1e0639dc6d4af2c4dd6c613992e87c5ab371db..420ec8fdb8d923cd3fff3e5e290a969d49933f7c 100644
--- a/Station.cc
+++ b/Station.cc
@@ -37,11 +37,11 @@ Station::Station(const string &name, const vector3r_t &position)
         itsPosition(position),
         itsPhaseReference(position)
 {
-    if (DualDipoleAntenna::m_element_response == nullptr) {
-        DualDipoleAntenna::m_element_response.reset(new HamakerElementResponseLBA);
+    if (DualDipoleAntenna::itsElementResponse == nullptr) {
+        DualDipoleAntenna::itsElementResponse.reset(new HamakerElementResponseLBA);
     }
-    if (TileAntenna::m_element_response == nullptr) {
-        TileAntenna::m_element_response.reset(new HamakerElementResponseHBA);
+    if (TileAntenna::itsElementResponse == nullptr) {
+        TileAntenna::itsElementResponse.reset(new HamakerElementResponseHBA);
     }
 }
 
diff --git a/TileAntenna.cc b/TileAntenna.cc
index 339848120595eebb8184beb6d255fef1ac53494a..a8b97192596e7a185f675f61df71779d05d878ee 100644
--- a/TileAntenna.cc
+++ b/TileAntenna.cc
@@ -88,12 +88,12 @@ matrix22c_t TileAntenna::elementResponse(real_t freq,
     thetaphi[1] -= 5.0 * Constants::pi_4;
 
     matrix22c_t response;
-    m_element_response->element_response(freq, thetaphi[0], thetaphi[1],
+    itsElementResponse->element_response(freq, thetaphi[0], thetaphi[1],
         reinterpret_cast<std::complex<double> (&)[2][2]>(response));
     return response;
 }
 
-std::unique_ptr<ElementResponse> TileAntenna::m_element_response = nullptr;
+std::unique_ptr<ElementResponse> TileAntenna::itsElementResponse = nullptr;
 
 } //# namespace StationResponse
 } //# namespace LOFAR
diff --git a/TileAntenna.h b/TileAntenna.h
index 8e4eca54782ca0ed3467411aacfa083f19d0a69d..7d43f2fbd9134ec1d96c8680a9523613285b6d0f 100644
--- a/TileAntenna.h
+++ b/TileAntenna.h
@@ -63,7 +63,7 @@ public:
     virtual matrix22c_t elementResponse(real_t freq,
         const vector3r_t &direction) const final override;
 
-    static std::unique_ptr<ElementResponse> m_element_response;
+    static std::unique_ptr<ElementResponse> itsElementResponse;
 
 private:
     TileConfig  itsConfig;