Started cleanup after DDR refactor

@@ -8,10 +8,10 @@
 		<hr />
 		<table><tr>
 			<td class="ddrSummaryLeft">
-				<rhswp:NameValuePair arg:name="Report Number:" 				arg:value="{= rhspin:dtypeValue(?this, ddr:reportNo) }"  />
+				<rhswp:NameValuePair arg:name="Report Number:" 				arg:value="{= rhspin:dtypeValue(?this, ep-report:dailyDrillingReportNumber) }"  />
 				<rhswp:NameValuePair arg:name="Wellbore:" 					arg:value="{= rhspin:npdName(?wellBore) }" />
 				<rhswp:NameValuePair arg:name="Status:" 					arg:value="{TBD}" />
-				<rhswp:NameValuePair arg:name="Operator:" 					arg:value="{= spl:object(?dailyDrillingActivity, ep-activity:drillingOperator) }"  />
+				<rhswp:NameValuePair arg:name="Operator:" 					arg:value="{= spl:object(?dailyDrillingActivity, ep-activity:drillingOperator/ep-core:temporalPartOf) }"  />
 				<rhswp:NameValuePair arg:name="Rig name:" 					arg:value="{= ui:label(?rig) }"  />
 				<rhswp:NameValuePair arg:name="Spud date:" 					arg:value="{TBD}"  />
 				<rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" 		arg:value="{= rhspin:dtypeValue(?onWellBore, ddr:elevKelly) }" />
@@ -40,7 +40,7 @@
 				<rhswp:NameValuePair arg:name="Depth at Kick Off mTVD:" 	arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:tvdKickoff) }" />
 				<rhswp:NameValuePair arg:name="Depth mMD:" 					arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:md) }" />
 				<rhswp:NameValuePair arg:name="Depth mTVD:" 				arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:tvd) }" />
-				<rhswp:NameValuePair arg:name="Dist Drilled m:" 			arg:value="{= rhspin:dtypeValue(?dailyDrillingActivity, ddr:distDrill) }" />
+				<rhswp:NameValuePair arg:name="Dist Drilled m:" 			arg:value="{= rhspin:dtypeValue(?dailyDrillingActivity, ep-activity:distanceDrilled/ep-core:metre) }" />
 				<rhswp:NameValuePair arg:name="Hole Dia in:" 				arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:diaHole) }"  />
 				<rhswp:NameValuePair arg:name="Formation Strength g/cm3:" 		arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:strengthForm) }"  />
 				<rhswp:NameValuePair arg:name="Depth At Formation Strength mTVD:" arg:value="{= rhspin:dtypeValue(?temporalPartOfAWellBore, ddr:tvdStrengthForm) }" />