diff --git a/Core/include/Acts/Geometry/PortalShell.hpp b/Core/include/Acts/Geometry/PortalShell.hpp
index ae9333217d6..3baaf43f69e 100644
--- a/Core/include/Acts/Geometry/PortalShell.hpp
+++ b/Core/include/Acts/Geometry/PortalShell.hpp
@@ -30,7 +30,7 @@ class PortalShellBase {
  private:
 };
 
-class CylinderPortalShellBase : public PortalShellBase {
+class CylinderPortalShell : public PortalShellBase {
  public:
   // These values are synchronized with the BoundarySurfaceFace enum.
   // Once Gen1 is removed, this can be changed.
@@ -53,7 +53,7 @@ class CylinderPortalShellBase : public PortalShellBase {
   virtual void setPortal(std::shared_ptr<Portal> portal, Face face) = 0;
 };
 
-class SingleCylinderPortalShell : public CylinderPortalShellBase {
+class SingleCylinderPortalShell : public CylinderPortalShell {
  public:
   explicit SingleCylinderPortalShell(TrackingVolume& volume);
 
@@ -67,11 +67,11 @@ class SingleCylinderPortalShell : public CylinderPortalShellBase {
   std::array<std::shared_ptr<Portal>, 6> m_portals{};
 };
 
-class CylinderStackPortalShell : public CylinderPortalShellBase {
+class CylinderStackPortalShell : public CylinderPortalShell {
  public:
   /// @note The shells must be ordered in the given direction
   CylinderStackPortalShell(const GeometryContext& gctx,
-                           std::vector<CylinderPortalShellBase*> shells,
+                           std::vector<CylinderPortalShell*> shells,
                            BinningValue direction,
                            const Logger& logger = getDummyLogger());
 
@@ -82,7 +82,7 @@ class CylinderStackPortalShell : public CylinderPortalShellBase {
 
  private:
   BinningValue m_direction;
-  std::vector<CylinderPortalShellBase*> m_shells;
+  std::vector<CylinderPortalShell*> m_shells;
   bool m_hasInnerCylinder{true};
 };
 
diff --git a/Core/src/Geometry/PortalShell.cpp b/Core/src/Geometry/PortalShell.cpp
index 6bb433e7957..0811c5770c4 100644
--- a/Core/src/Geometry/PortalShell.cpp
+++ b/Core/src/Geometry/PortalShell.cpp
@@ -89,7 +89,7 @@ std::size_t SingleCylinderPortalShell::size() const {
 }
 
 CylinderStackPortalShell::CylinderStackPortalShell(
-    const GeometryContext& gctx, std::vector<CylinderPortalShellBase*> shells,
+    const GeometryContext& gctx, std::vector<CylinderPortalShell*> shells,
     BinningValue direction, const Logger& logger)
     : m_direction{direction}, m_shells{std::move(shells)} {
   if (m_shells.size() < 2) {
diff --git a/Tests/UnitTests/Core/Geometry/PortalShellTests.cpp b/Tests/UnitTests/Core/Geometry/PortalShellTests.cpp
index 66200c17f9e..8a49b41f854 100644
--- a/Tests/UnitTests/Core/Geometry/PortalShellTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/PortalShellTests.cpp
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(ConstructionFromVolume) {
   SingleCylinderPortalShell shell1{cyl1};
   BOOST_CHECK_EQUAL(shell1.size(), 4);
 
-  using enum CylinderPortalShellBase::Face;
+  using enum CylinderPortalShell::Face;
 
   const auto* pDisc = shell1.portal(PositiveDisc);
   BOOST_REQUIRE_NE(pDisc, nullptr);
@@ -290,7 +290,7 @@ BOOST_AUTO_TEST_CASE(ConstructionFromVolume) {
 //              inner cylinder
 
 BOOST_AUTO_TEST_CASE(PortalAssignment) {
-  using enum CylinderPortalShellBase::Face;
+  using enum CylinderPortalShell::Face;
   TrackingVolume vol(
       Transform3::Identity(),
       std::make_shared<CylinderVolumeBounds>(30_mm, 100_mm, 100_mm));
@@ -341,7 +341,7 @@ BOOST_AUTO_TEST_CASE(PortalAssignment) {
 
 BOOST_AUTO_TEST_SUITE(CylinderStack)
 BOOST_AUTO_TEST_CASE(ZDirection) {
-  using enum CylinderPortalShellBase::Face;
+  using enum CylinderPortalShell::Face;
   BOOST_TEST_CONTEXT("rMin>0") {
     TrackingVolume vol1(
         Transform3{Translation3{Vector3::UnitZ() * -100_mm}},
@@ -434,7 +434,7 @@ BOOST_AUTO_TEST_CASE(ZDirection) {
 }
 
 BOOST_AUTO_TEST_CASE(RDirection) {
-  using enum CylinderPortalShellBase::Face;
+  using enum CylinderPortalShell::Face;
   BOOST_TEST_CONTEXT("rMin>0") {
     TrackingVolume vol1(
         Transform3::Identity(),