diff --git a/Packages/lesiontracker/client/components/flexboxLayout/flexboxLayout.html b/Packages/lesiontracker/client/components/flexboxLayout/flexboxLayout.html
index 7b4535a57..72f43a487 100644
--- a/Packages/lesiontracker/client/components/flexboxLayout/flexboxLayout.html
+++ b/Packages/lesiontracker/client/components/flexboxLayout/flexboxLayout.html
@@ -1,17 +1,17 @@
 <template name="flexboxLayout">
     <div class="viewerSection">
         <div class="sidebarMenu sidebar-left {{#if leftSidebarOpen}}sidebar-open{{/if}}">
-            {{>studyTimepointBrowser (extend this)}}
+            {{>studyTimepointBrowser (clone this)}}
         </div>
         <div class="mainContent {{#if leftSidebarOpen}}sidebar-left-open{{/if}} {{#if rightSidebarOpen}}sidebar-right-open{{/if}}">
-            {{>viewerMain (extend this)}}
+            {{>viewerMain (clone this)}}
         </div>
         <div class="sidebarMenu sidebar-right {{#if or lesionSidebarOpen additionalFindingsSidebarOpen}}sidebar-open{{/if}}">
             <div class="sidebar-option {{#if lesionSidebarOpen}}active{{/if}}">
-                {{>lesionTable (extend this)}}
+                {{>lesionTable (clone this)}}
             </div>
             <div class="sidebar-option {{#if additionalFindingsSidebarOpen}}active{{/if}}">
-                {{>additionalFindings (extend this)}}
+                {{>additionalFindings (clone this)}}
             </div>
         </div>
     </div>
diff --git a/Packages/lesiontracker/client/components/lesionTable/lesionTable.html b/Packages/lesiontracker/client/components/lesionTable/lesionTable.html
index 2cee9bdc5..2034895b9 100644
--- a/Packages/lesiontracker/client/components/lesionTable/lesionTable.html
+++ b/Packages/lesiontracker/client/components/lesionTable/lesionTable.html
@@ -8,6 +8,6 @@
                 {{>lesionTableTimepointHeader}}
             {{/each}}
         </div>
-        {{>lesionTableView (extend this)}}
+        {{>lesionTableView (clone this)}}
     </div>
 </template>
diff --git a/Packages/lesiontracker/client/components/lesionTableHUD/lesionTableHUD.html b/Packages/lesiontracker/client/components/lesionTableHUD/lesionTableHUD.html
index 63f934436..83c921ded 100644
--- a/Packages/lesiontracker/client/components/lesionTableHUD/lesionTableHUD.html
+++ b/Packages/lesiontracker/client/components/lesionTableHUD/lesionTableHUD.html
@@ -6,7 +6,7 @@
                 <use xlink:href="/packages/lesiontracker/assets/icons.svg#icon-ui-close"></use>
             </svg>
         </div>
-        {{>lesionTableView (extend this)}}
+        {{>lesionTableView (clone this)}}
         <div class="footer">
             {{#each toolbarButton in toolbarButtons}}
                 {{>toolbarSectionButton toolbarButton}}
diff --git a/Packages/lesiontracker/client/components/lesionTableView/lesionTableView.html b/Packages/lesiontracker/client/components/lesionTableView/lesionTableView.html
index 6afabeb8f..bd1cd9c6c 100644
--- a/Packages/lesiontracker/client/components/lesionTableView/lesionTableView.html
+++ b/Packages/lesiontracker/client/components/lesionTableView/lesionTableView.html
@@ -2,18 +2,18 @@
     <div class="lesionTableView scrollArea">
         {{>lesionTableHeaderRow id="target" measurements=targets currentTimepointId=currentTimepointId}}
         {{#each target in targets}}
-            {{>lesionTableRow (extend this rowItem=target)}}
+            {{>lesionTableRow (clone this rowItem=target)}}
         {{/each}}
 
         {{>lesionTableHeaderRow id="nonTarget" measurements=nonTargets currentTimepointId=currentTimepointId}}
         {{#each nonTarget in nonTargets}}
-            {{>lesionTableRow (extend this rowItem=nonTarget)}}
+            {{>lesionTableRow (clone this rowItem=nonTarget)}}
         {{/each}}
 
         {{#if gt this.timepoints.get.length 1}}
             {{>lesionTableHeaderRow id="newLesion" measurements=newLesions currentTimepointId=currentTimepointId}}
             {{#each newLesion in newLesions}}
-                {{>lesionTableRow (extend this rowItem=newLesion)}}
+                {{>lesionTableRow (clone this rowItem=newLesion)}}
             {{/each}}
         {{/if}}
     </div>
diff --git a/Packages/lesiontracker/client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.html b/Packages/lesiontracker/client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.html
index 6833bd978..7cc722b93 100644
--- a/Packages/lesiontracker/client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.html
+++ b/Packages/lesiontracker/client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.html
@@ -7,7 +7,7 @@
                     <div class="studyBox"></div>
                     <div class="switchHover studyHover clearfix">
                         <div class="scrollArea">
-                            {{>studyTimepointBrowser (extend this timepointViewType='key')}}
+                            {{>studyTimepointBrowser (clone this timepointViewType='key')}}
                         </div>
                     </div>
                 </div>
@@ -29,7 +29,7 @@
                             <div class="scrollArea">
                                 <div class="thumbnailsWrapper">
                                     {{#each thumbnail in thumbnailsList}}
-                                        {{>thumbnailEntry (extend this thumbnail=thumbnail)}}
+                                        {{>thumbnailEntry (clone this thumbnail=thumbnail)}}
                                     {{/each}}
                                 </div>
                             </div>
diff --git a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepoint.html b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepoint.html
index eea999efc..cd27b5221 100644
--- a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepoint.html
+++ b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepoint.html
@@ -2,7 +2,7 @@
     <div class="studyTimepointWrapper">
         <div class="studyTimepoint">
             {{#each study in studies}}
-                {{>studyTimepointStudy (extend this
+                {{>studyTimepointStudy (clone this
                     study=study
                     active=(isActive study)
                 )}}
diff --git a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointBrowser.html b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointBrowser.html
index 571e1b7c4..15ae3a030 100644
--- a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointBrowser.html
+++ b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointBrowser.html
@@ -32,7 +32,7 @@
                         {{/if}}
                     {{else}}
                         <div class="p-t-2">
-                            {{>studyTimepoint (extend this studies=studies)}}
+                            {{>studyTimepoint (clone this studies=studies)}}
                         </div>
                     {{/if}}
                 </div>
diff --git a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.html b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.html
index 07804e483..a878e998b 100644
--- a/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.html
+++ b/Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.html
@@ -20,7 +20,7 @@
             {{#if isSidebar}}
                 <div class="studyTimepointThumbnails">
                     {{#each thumbnail in (studyThumbnails this.study)}}
-                        {{>thumbnailEntry (extend this thumbnail=thumbnail)}}
+                        {{>thumbnailEntry (clone this thumbnail=thumbnail)}}
                     {{/each}}
                 </div>
             {{/if}}
diff --git a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html
index 1ee05be8d..1aa9e9c34 100644
--- a/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html
+++ b/Packages/lesiontracker/client/components/toolbarSection/toolbarSection.html
@@ -27,10 +27,10 @@
             </div>
 
             {{#if splitView}}
-                {{>studySeriesQuickSwitch (extend this side="right" viewportIndex=1)}}
-                {{>studySeriesQuickSwitch (extend this side="left" viewportIndex=0)}}
+                {{>studySeriesQuickSwitch (clone this side="right" viewportIndex=1)}}
+                {{>studySeriesQuickSwitch (clone this side="left" viewportIndex=0)}}
             {{else}}
-                {{>studySeriesQuickSwitch (extend this side="middle" viewportIndex=0)}}
+                {{>studySeriesQuickSwitch (clone this side="middle" viewportIndex=0)}}
             {{/if}}
 
             <div class="toolbarSectionEntry pull-right rm-l-1 p-x-1">
diff --git a/Packages/lesiontracker/client/components/viewer/viewer.html b/Packages/lesiontracker/client/components/viewer/viewer.html
index 1c36bbf18..149266e42 100644
--- a/Packages/lesiontracker/client/components/viewer/viewer.html
+++ b/Packages/lesiontracker/client/components/viewer/viewer.html
@@ -5,12 +5,12 @@
             {{>lesionLocationDialog}}
             {{>nonTargetLesionDialog}}
             {{>nonTargetResponseDialog}}
-            {{>lesionTableHUD (extend this)}}
+            {{>lesionTableHUD (clone this)}}
             {{! >conformanceCheckFeedback}}
         </div>
         <div id="viewer">
-            {{>toolbarSection (extend this)}}
-            {{>flexboxLayout (extend this)}}
+            {{>toolbarSection (clone this)}}
+            {{>flexboxLayout (clone this)}}
         </div>
     {{else}}
         {{>loadingText}}
diff --git a/Packages/viewerbase/client/components/studyBrowser/thumbnailEntry/thumbnailEntry.html b/Packages/viewerbase/client/components/studyBrowser/thumbnailEntry/thumbnailEntry.html
index 0245fabe4..e890c6669 100644
--- a/Packages/viewerbase/client/components/studyBrowser/thumbnailEntry/thumbnailEntry.html
+++ b/Packages/viewerbase/client/components/studyBrowser/thumbnailEntry/thumbnailEntry.html
@@ -1,7 +1,7 @@
 <template name="thumbnailEntry">
     <div class="thumbnailEntry m-t-1 m-b-2 {{draggableClass}} {{#if isSeriesActive this.thumbnail.stack.seriesInstanceUid viewportIndex}}active{{/if}}">
         <div class="p-x-1">
-            {{>imageThumbnail (extend this)}}
+            {{>imageThumbnail (clone this)}}
         </div>
         <div class="seriesDetails noselect m-a-1">
             <div class="seriesDescription">