https://bugs.eclipse.org/bugs/show_bug.cgi?id=243937
diff --git a/libraries/EPF_Practices_Library/configurations/publish.all_epf_practices.xmi b/libraries/EPF_Practices_Library/configurations/publish.all_epf_practices.xmi
index 487ee8e..9f57694 100644
--- a/libraries/EPF_Practices_Library/configurations/publish.all_epf_practices.xmi
+++ b/libraries/EPF_Practices_Library/configurations/publish.all_epf_practices.xmi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore" xmlns:epf="http://www.eclipse.org/epf"
-    epf:version="1.5.0" xmlns:rmc="http://www.ibm.com/rmc" rmc:version="7.5.0" xmi:id="_QD87wFRHEd2CWscN8Mx6rg"
+    xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore" xmlns:rmc="http://www.ibm.com/rmc"
+    rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.5.0" xmi:id="_QD87wFRHEd2CWscN8Mx6rg"
     name="publish.all_epf_practices" guid="_QD87wFRHEd2CWscN8Mx6rg" presentationName="All EPF Practices"
     briefDescription="This configuration is used by process authors to view the available practices."
     version="7.5.0">
@@ -156,7 +156,6 @@
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_XPLD8MudEdyRPtFYRAKVDg#_XPLD_cudEdyRPtFYRAKVDg"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_4gaS7rPREduocbW-TPTq7A"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_XPLD8MudEdyRPtFYRAKVDg#_Ks_WoOCiEdynptYdmll41Q"/>
-  <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_NInusM3iEdyjXslGsagg_w"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_D-ExQMktEdygFZkm1d5NtQ#_J6WicMktEdygFZkm1d5NtQ"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_rA1NMM3lEdyjXslGsagg_w"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_Y9TKMLS9EduDY8LNbMCDBA#_Y9TKPbS9EduDY8LNbMCDBA"/>
diff --git a/libraries/EPF_Practices_Library/configurations/publish.openup.xmi b/libraries/EPF_Practices_Library/configurations/publish.openup.xmi
index db42a9d..98bf544 100644
--- a/libraries/EPF_Practices_Library/configurations/publish.openup.xmi
+++ b/libraries/EPF_Practices_Library/configurations/publish.openup.xmi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore" xmlns:epf="http://www.eclipse.org/epf"
-    epf:version="1.5.0" xmi:id="_QN3nQBEHEdyM7Iu0sxfrPA"
+    xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore" xmlns:rmc="http://www.ibm.com/rmc"
+    rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.5.0" xmi:id="_QN3nQBEHEdyM7Iu0sxfrPA"
     name="publish.openup" guid="_QN3nQBEHEdyM7Iu0sxfrPA" version="1.0.0">
   <methodElementProperty xmi:id="_sjD4AEIwEd2GCesTWQms8Q" name="TouchedByConfigEditor"
       value="true"/>
@@ -95,7 +95,6 @@
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_GxBjAM2sEdym_ZFqrJcXUg#_GxBjDs2sEdym_ZFqrJcXUg"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_xhaxgKtYEdytrdP46hWyHg"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#__EXZIKtYEdytrdP46hWyHg"/>
-  <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_NInusM3iEdyjXslGsagg_w"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_rA1NMM3lEdyjXslGsagg_w"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_4gaS7bPREduocbW-TPTq7A"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_ejTSsMQOEduMu5zRIJX95g"/>
diff --git a/libraries/EPF_Practices_Library/configurations/zconstruct.process.openup.xmi b/libraries/EPF_Practices_Library/configurations/zconstruct.process.openup.xmi
index e8344c7..fea59a4 100644
--- a/libraries/EPF_Practices_Library/configurations/zconstruct.process.openup.xmi
+++ b/libraries/EPF_Practices_Library/configurations/zconstruct.process.openup.xmi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.epf.uma:MethodConfiguration xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore" xmlns:epf="http://www.eclipse.org/epf"
-    epf:version="1.5.0" xmi:id="_gExDwNQxEdyk9oc_L5Vk0g"
+    xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore" xmlns:rmc="http://www.ibm.com/rmc"
+    rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf" epf:version="1.5.0" xmi:id="_gExDwNQxEdyk9oc_L5Vk0g"
     name="zconstruct.process.openup" guid="_gExDwNQxEdyk9oc_L5Vk0g" version="1.0.0">
   <methodPluginSelection href="uma://_vsno4EKmEdyrauqpmnA8jQ#_vsno4EKmEdyrauqpmnA8jQ"/>
   <methodPluginSelection href="uma://_iVydgENdEdy245g62lfWcA#_iVydgENdEdy245g62lfWcA"/>
@@ -131,7 +131,6 @@
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_GxBjAM2sEdym_ZFqrJcXUg#_GxBjDs2sEdym_ZFqrJcXUg"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_xhaxgKtYEdytrdP46hWyHg"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#__EXZIKtYEdytrdP46hWyHg"/>
-  <methodPackageSelection xsi:type="org.eclipse.epf.uma:ContentPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_NInusM3iEdyjXslGsagg_w"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_4gaS7bPREduocbW-TPTq7A"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_ejTSsMQOEduMu5zRIJX95g"/>
   <methodPackageSelection xsi:type="org.eclipse.epf.uma:ProcessPackage" href="uma://_4gaS4LPREduocbW-TPTq7A#_4gaS7rPREduocbW-TPTq7A"/>
diff --git a/libraries/EPF_Practices_Library/meth_mgmt.review_status.base/plugin.xmi b/libraries/EPF_Practices_Library/meth_mgmt.review_status.base/plugin.xmi
index 8afec63..76d3c47 100644
--- a/libraries/EPF_Practices_Library/meth_mgmt.review_status.base/plugin.xmi
+++ b/libraries/EPF_Practices_Library/meth_mgmt.review_status.base/plugin.xmi
@@ -131,7 +131,6 @@
             <categorizedElements xsi:type="org.eclipse.epf.uma:SupportingMaterial"
                 href="uma://_4gaS4LPREduocbW-TPTq7A#_rA1NMc3lEdyjXslGsagg_w"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:Checklist" href="uma://_4gaS4LPREduocbW-TPTq7A#_17PYUNd6EdmIm-bsRSNCgw"/>
-            <categorizedElements xsi:type="org.eclipse.epf.uma:Artifact" href="uma://_4gaS4LPREduocbW-TPTq7A#_QHYwcM3jEdyjXslGsagg_w"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:Task" href="uma://_4gaS4LPREduocbW-TPTq7A#_s4ojQNqREdy88NBoQgfGyg"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:Role" href="uma://_A118oMYaEdyXeo04os5BOw#_0X9iEMlgEdmt3adZL5Dmdw"/>
             <categorizedElements xsi:type="org.eclipse.epf.uma:TermDefinition" href="uma://_OOB2AAouEdyhlpBPrduOMw#_VHFGkEvCEdunZcj9T5hrMQ"/>
diff --git a/libraries/EPF_Practices_Library/practice.tech.evolutionary_arch.base/plugin.xmi b/libraries/EPF_Practices_Library/practice.tech.evolutionary_arch.base/plugin.xmi
index 070a999..8b5cd85 100644
--- a/libraries/EPF_Practices_Library/practice.tech.evolutionary_arch.base/plugin.xmi
+++ b/libraries/EPF_Practices_Library/practice.tech.evolutionary_arch.base/plugin.xmi
@@ -2,8 +2,8 @@
 <xmi:XMI xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore" xmlns:org.eclipse.epf.uma.resourcemanager="http:///org/eclipse/epf/uma/resourcemanager.ecore"
-    xmlns:epf="http://www.eclipse.org/epf" epf:version="1.5.0" xmlns:rmc="http://www.ibm.com/rmc"
-    rmc:version="7.5.0">
+    xmlns:rmc="http://www.ibm.com/rmc" rmc:version="7.5.0" xmlns:epf="http://www.eclipse.org/epf"
+    epf:version="1.5.0">
   <org.eclipse.epf.uma.resourcemanager:ResourceManager xmi:id="_4ggZgbPREduocbW-TPTq7A"
       guid="_4ggZgbPREduocbW-TPTq7A">
     <resourceDescriptors xmi:id="_m_D6YPL5Edm6Nvont3uinw" id="_17Ve8Nd6EdmIm-bsRSNCgw"
@@ -28,8 +28,6 @@
         uri="tasks/outline_the_arch.vm.xmi"/>
     <resourceDescriptors xmi:id="_8KSvcdqREdy88NBoQgfGyg" id="-E459X-McFVuJGngiFPWf6w"
         uri="tasks/refine_the_arch.vm.xmi"/>
-    <resourceDescriptors xmi:id="_gie0AdqTEdy88NBoQgfGyg" id="-KmIIyuXPr1pe5iREXAoMYw"
-        uri="workproducts/arch_notebook.res.xmi"/>
     <resourceDescriptors xmi:id="_5h6ikR4qEd2bS8fFOQ7WWA" id="-TleqHW_wvIYc0qLQgZUchA"
         uri="guidances/practices/evolutionary_arch.xmi"/>
   </org.eclipse.epf.uma.resourcemanager:ResourceManager>
@@ -92,19 +90,6 @@
               <presentation xmi:id="-E459X-McFVuJGngiFPWf6w" href="uma://-E459X-McFVuJGngiFPWf6w#-E459X-McFVuJGngiFPWf6w"/>
             </contentElements>
           </childPackages>
-          <childPackages xsi:type="org.eclipse.epf.uma:ContentPackage" xmi:id="_NInusM3iEdyjXslGsagg_w"
-              name="Resources" guid="_NInusM3iEdyjXslGsagg_w" briefDescription="This package contains the resources (e.g., templates, examples, reports, etc.) associated with the Evolutionary Architecture Practice.  These resources are in a separate pacakge to make them easy to de-select from a configuration and replace with customized resources.">
-            <contentElements xsi:type="org.eclipse.epf.uma:Template" xmi:id="_me8WcAANEdyRS9uciXlZ6g"
-                name="architecture_notebook" guid="_me8WcAANEdyRS9uciXlZ6g" presentationName="Architecture Notebook"
-                briefDescription="Template for describing the architecture.">
-              <presentation xmi:id="-h09djKXIOUJlez8h6UXrWw" href="uma://-h09djKXIOUJlez8h6UXrWw#-h09djKXIOUJlez8h6UXrWw"/>
-            </contentElements>
-            <contentElements xsi:type="org.eclipse.epf.uma:Artifact" xmi:id="_QHYwcM3jEdyjXslGsagg_w"
-                name="arch_notebook.res" guid="_QHYwcM3jEdyjXslGsagg_w" variabilityType="contributes"
-                variabilityBasedOnElement="_0XAf0MlgEdmt3adZL5Dmdw" templates="_me8WcAANEdyRS9uciXlZ6g">
-              <presentation xmi:id="-KmIIyuXPr1pe5iREXAoMYw" href="uma://-KmIIyuXPr1pe5iREXAoMYw#-KmIIyuXPr1pe5iREXAoMYw"/>
-            </contentElements>
-          </childPackages>
           <contentElements xsi:type="org.eclipse.epf.uma:Task" xmi:id="_0f-1oMlgEdmt3adZL5Dmdw"
               name="outline_the_arch" guid="_0f-1oMlgEdmt3adZL5Dmdw" presentationName="Outline the Architecture"
               briefDescription="This task is where the &quot;vision&quot; for the architecture is developed through analysis of the architecturally significant requirements and identification of architectural constraints, decisions and objectives.  "
@@ -162,7 +147,7 @@
           <contentElements xsi:type="org.eclipse.epf.uma:Artifact" xmi:id="_0XAf0MlgEdmt3adZL5Dmdw"
               name="architecture_notebook" guid="_0XAf0MlgEdmt3adZL5Dmdw" presentationName="Architecture Notebook"
               briefDescription="This artifact describes the rationale, assumptions, explanations and implications of the decisions that were made in forming the architecture. "
-              checklists="_17PYUNd6EdmIm-bsRSNCgw">
+              checklists="_17PYUNd6EdmIm-bsRSNCgw" templates="_me8WcAANEdyRS9uciXlZ6g">
             <presentation xmi:id="_H4gOYKYTEdmvhNXG0Oc2uA" href="uma://_H4gOYKYTEdmvhNXG0Oc2uA#_H4gOYKYTEdmvhNXG0Oc2uA"/>
             <conceptsAndPapers href="uma://_OOB2AAouEdyhlpBPrduOMw#__O7tAMVvEduLYZUGfgZrkQ"/>
             <fulfills href="uma://_-bv0ELXuEduGP_98XMd0fg#_8OD-cLPTEduocbW-TPTq7A"/>
@@ -183,6 +168,11 @@
             <contentReferences xsi:type="org.eclipse.epf.uma:Guideline" href="uma://_OOB2AAouEdyhlpBPrduOMw#_vO2uoO0OEduUpsu85bVhiQ"/>
             <contentReferences xsi:type="org.eclipse.epf.uma:SupportingMaterial" href="#_rA1NMc3lEdyjXslGsagg_w"/>
           </contentElements>
+          <contentElements xsi:type="org.eclipse.epf.uma:Template" xmi:id="_me8WcAANEdyRS9uciXlZ6g"
+              name="architecture_notebook" guid="_me8WcAANEdyRS9uciXlZ6g" presentationName="Architecture Notebook"
+              briefDescription="Template for describing the architecture.">
+            <presentation xmi:id="-h09djKXIOUJlez8h6UXrWw" href="uma://-h09djKXIOUJlez8h6UXrWw#-h09djKXIOUJlez8h6UXrWw"/>
+          </contentElements>
         </childPackages>
         <childPackages xsi:type="org.eclipse.epf.uma:ContentPackage" xmi:id="_rA1NMM3lEdyjXslGsagg_w"
             name="release_info" guid="_rA1NMM3lEdyjXslGsagg_w" presentationName="Release Info">
diff --git a/libraries/EPF_Practices_Library/practice.tech.evolutionary_arch.base/workproducts/arch_notebook.res.xmi b/libraries/EPF_Practices_Library/practice.tech.evolutionary_arch.base/workproducts/arch_notebook.res.xmi
deleted file mode 100644
index ba7f470..0000000
--- a/libraries/EPF_Practices_Library/practice.tech.evolutionary_arch.base/workproducts/arch_notebook.res.xmi
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.epf.uma:ArtifactDescription xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.epf.uma="http://www.eclipse.org/epf/uma/1.0.5/uma.ecore"
-    xmlns:epf="http://www.eclipse.org/epf" epf:version="1.5.0" xmlns:rmc="http://www.ibm.com/rmc"
-    rmc:version="7.5.0" xmi:id="-KmIIyuXPr1pe5iREXAoMYw"
-    name="arch_notebook.res,_QHYwcM3jEdyjXslGsagg_w" guid="-KmIIyuXPr1pe5iREXAoMYw"
-    changeDate="2008-08-11T10:12:15.859-0700" version="7.2.0"/>