diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
index 4eb97c2228ce8..808af3af8fd03 100644
--- a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
+++ b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
@@ -1315,19 +1315,19 @@ std::pair<int, int> HGCalDDDConstants::waferTypeRotation(
     int layer, int waferU, int waferV, bool fromFile, bool debug) const {
   int type(HGCalTypes::WaferOut), rotn(0);
   int wl = HGCalWaferIndex::waferIndex(layer, waferU, waferV);
-  bool endOfList(true);
+  bool withinList(true);
   if (fromFile && (waferFileSize() > 0)) {
     auto itr = hgpar_->waferInfoMap_.find(wl);
-    endOfList = (itr != hgpar_->waferInfoMap_.end());
-    if (endOfList) {
+    withinList = (itr != hgpar_->waferInfoMap_.end());
+    if (withinList) {
       type = (itr->second).part;
       rotn = (itr->second).orient;
     }
   } else {
     auto itr = hgpar_->waferTypes_.find(wl);
     if ((mode_ == HGCalGeometryMode::Hexagon8) || (mode_ == HGCalGeometryMode::Hexagon8Full)) {
-      endOfList = (itr != hgpar_->waferTypes_.end());
-      if (endOfList) {
+      withinList = (itr != hgpar_->waferTypes_.end());
+      if (withinList) {
         if ((itr->second).second < HGCalWaferMask::k_OffsetRotation) {
           rotn = (itr->second).second;
           if ((itr->second).first == HGCalGeomTools::k_allCorners) {
@@ -1349,7 +1349,7 @@ std::pair<int, int> HGCalDDDConstants::waferTypeRotation(
 #ifdef EDM_ML_DEBUG
   if (debug)
     edm::LogVerbatim("HGCalGeom") << "waferTypeRotation: Layer " << layer << " Wafer " << waferU << ":" << waferV
-                                  << " Index " << std::hex << wl << std::dec << ":" << endOfList << " Type " << type
+                                  << " Index " << std::hex << wl << std::dec << ":" << withinList << " Type " << type
                                   << " Rotation " << rotn;
 #endif
   return std::make_pair(type, rotn);