diff --git a/compact/hcal.xml b/compact/hcal.xml
index 66c1f08d4f12e172a94628a2a811bea15777baed..3edc03e2ba259bb42ed30715350d6c1acf147ab3 100644
--- a/compact/hcal.xml
+++ b/compact/hcal.xml
@@ -41,7 +41,7 @@
     <detector 
       id="HCalEndcapP_ID" 
       name="HcalEndcapP" 
-      type="topside_PolyhedraEndcapCalorimeter2" 
+      type="refdet_PolyhedraEndcapCalorimeter2" 
       readout="HcalEndcapHits" 
       vis="HcalEndcapVis" 
       calorimeterType="HAD_ENDCAP"
@@ -64,7 +64,7 @@
     <detector 
       id="HCalEndcapN_ID" 
       name="HcalEndcapN" 
-      type="topside_PolyhedraEndcapCalorimeter2" 
+      type="refdet_PolyhedraEndcapCalorimeter2" 
       readout="HcalEndcapHits" 
       vis="HcalEndcapVis" 
       calorimeterType="HAD_ENDCAP" reflect="true">
diff --git a/reference_detector.xml b/reference_detector.xml
index 3b0bcc4663534df7f956bf0310d2c82c0b863d4f..3bcb17c9ae6245778b721f57cc5cfa6ef2594856 100644
--- a/reference_detector.xml
+++ b/reference_detector.xml
@@ -109,9 +109,9 @@
   <include ref="compact/display.xml" />
   </display>
 
+  <include ref="ip6/beampipe.xml"/>
   <!--
   <include ref="reference_detector/vertex_tracker.xml"/>
-  <include ref="compact/beampipe.xml"/>
   <include ref="compact/silicon_tracker.xml"/>
   -->
   <include ref="compact/solenoid.xml"/>