diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test b/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test
index 2d02514..4c77555 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test
@@ -7,7 +7,7 @@
 External-Reference: 
 Id: _XogaUM-8EemDG-PUFK2qgQ
 Runtime-Version: 2.4.2.201905052359
-Save-Time: 10/1/19 12:22 PM
+Save-Time: 10/5/19 9:57 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -28,7 +28,7 @@
     get-tree | select "Template Collection" | get-menu -path Template | click
     get-button "Create and link new Instance" | click
 }
-get-window "New Reference Element" | get-tree | select "template/ViewTemplate" | double-click
+get-window "Select Sub Class and Template" | get-tree | select "template/ViewTemplate" | double-click
 with [get-editor "test.datatemplate"] {
     get-tree | select "Template Collection/Template/View Template" | get-menu -path Style | click
     get-button "Link Style Property" | click
@@ -36,7 +36,7 @@
 get-window "Select Elements" | get-table | get-property itemCount | equals 0 | verify-true
 get-window "Select Elements" | get-button Cancel | click
 get-editor "test.datatemplate" | get-button "Create and link new Style Property" | click
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "fontProperties/FontPropertiesStyleProperty"
     get-button Finish | click
 }
@@ -48,7 +48,7 @@
 get-window "Select Elements" | get-table | get-property itemCount | equals 1 | verify-true
 get-window "Select Elements" | get-button Cancel | click
 get-editor "test.datatemplate" | get-button "Create and link new Style Property" | click
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "tableValidation/TableValidationStyleProperty"
     get-button Finish | click
 }
@@ -60,7 +60,7 @@
     get-tree | select "Template Collection" | get-menu -path Template | click
     get-button "Create and link new Instance" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "template/ViewTemplate"
     get-button Finish | click
 }
@@ -75,7 +75,7 @@
     get-tree | select "Template Collection" | get-menu -path Template | click
     get-button "Create and link new Instance" | click
 }
-get-window "New Reference Element" | get-tree | select "bowling/League" | double-click
+get-window "Select Sub Class and Template" | get-tree | select "bowling/League" | double-click
 with [get-editor "test.datatemplate"] {
     get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2 | get-item -path League]
     get-button "Add an instance of Player" | click
@@ -89,7 +89,7 @@
     get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2]
     get-button "Create and link new Instance" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "bowling/Fan"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
index 5723f0a..605dc54 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
@@ -1,13 +1,13 @@
 --- RCPTT testcase ---
 Format-Version: 1.0
-Contexts: _ZOi4wZ77EeOm87IlbkWrfQ,_ihvnUC3mEeSwhO5Nwx0hPg
+Contexts: _ZOi4wZ77EeOm87IlbkWrfQ,_Iu0EsS36EeSYRYqCbC6LMQ
 Element-Name: TableSubTypeSupport
 Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _uDtLYDnOEeiT54i24ck9dw
 Runtime-Version: 2.4.2.201905052359
-Save-Time: 5/6/19 3:00 PM
+Save-Time: 10/5/19 9:54 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -71,12 +71,12 @@
 //get-view "EMF Forms Preview" | get-button "Refresh Preview View" | click
 get-view "EMF Forms Preview" | get-table | get-property "getColumnCount()" | equals 19 | verify-true
 get-view "EMF Forms Preview" | get-button "Add an instance of EStructuralFeature" | click
-with [get-window "New Reference Element" | get-tree] {
+with [get-window "Select Sub Class and Template" | get-tree] {
     get-property itemCount | equals 2 | verify-true
     get-property "getItems().TreeItem[0].getText()" | equals EAttribute | verify-true
     get-property "getItems().TreeItem[1].getText()" | equals EReference | verify-true
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select EAttribute
     get-button Finish | click
 }
@@ -136,7 +136,7 @@
     }
     get-button "Add an instance of EStructuralFeature" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select EReference
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test
index 37d8d95..5ff71c2 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _uCoUgDmmEeiV5MMKft7xVA
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:30 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:57 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,19 +18,19 @@
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Selector" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "bool/AndSelector"
     get-button Finish | click
 }
 with [get-window AndSelector] {
     get-button "Create and link new Style Selector" | click
-    with [get-window "New Reference Element"] {
+    with [get-window "Select Sub Class and Template"] {
         get-tree | select "viewModelElement/ViewModelElementSelector"
         get-button Finish | click
     }
     get-window ViewModelElementSelector | get-button OK | click
     get-button "Create and link new Style Selector" | click
-    with [get-window "New Reference Element"] {
+    with [get-window "Select Sub Class and Template"] {
         get-tree | select "annotation/AnnotationSelector"
         get-button Finish | click
     }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test
index ed7e959..d518aea 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _PcpI0DmJEeiUsKIXZxWPjg
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:22 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,7 +18,7 @@
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Selector" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "annotation/AnnotationSelector"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test
index b0edb24..f01f801 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _-p_yMKoHEeminf0o9fO9mA
-Runtime-Version: 2.5.0.201907120000
-Save-Time: 7/19/19 2:44 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -25,7 +25,7 @@
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Style Property" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "mandatory/MandatoryStyleProperty"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test
index 58db264..c90c19a 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _6KV0MKoAEeminf0o9fO9mA
-Runtime-Version: 2.5.0.201907120000
-Save-Time: 7/19/19 2:44 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -24,7 +24,7 @@
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Style Property" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "mandatory/MandatoryStyleProperty"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test
index 950f0d7..ef02657 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _JU4aMDmmEeiV5MMKft7xVA
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:26 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,13 +18,13 @@
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Selector" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "hierarchy/HierarchySelector"
     get-button Finish | click
 }
 with [get-window HierarchySelector] {
     get-button "Create and link new Selector" | click
-    with [get-window "New Reference Element"] {
+    with [get-window "Select Sub Class and Template"] {
         get-tree | select "viewModelElement/ViewModelElementSelector"
         get-button Finish | click
     }
@@ -46,7 +46,7 @@
     }
     get-button "Create and link new Selector" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "viewModelElement/ViewModelElementSelector"
     get-button Finish | click
 }
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test
index ee3a51f..c451da5 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test
@@ -6,8 +6,8 @@
 Element-Version: 3.0
 External-Reference: 
 Id: _RKICsDmnEeiV5MMKft7xVA
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:33 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
 Testcase-Type: ecl
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,7 +18,7 @@
     get-tree | select "View Template" | get-menu -path Style | click
     get-button "Create and link new Style Property" | click
 }
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
     get-tree | select "wrap/LabelWrapStyleProperty"
     get-button Finish | click
 }