diff --git a/EC-GN-JA-PCF-IN/pom.xml b/EC-GN-JA-PCF-IN/pom.xml
index f772f8d..3bf6f75 100755
--- a/EC-GN-JA-PCF-IN/pom.xml
+++ b/EC-GN-JA-PCF-IN/pom.xml
@@ -70,9 +70,9 @@ of the distribution package..
                             <define macroname="project_version">${project.version}</define>
                             <define macroname="project_description">${project.description}</define>
                         </rpmspec>
-                        <package name="EC-GN-PSH0PCF-ioc">
+                        <package name="EC-GN-PCF0CORE-ioc">
                             <url>${rpm.vcs.url}</url>
-                            <include name="EC-GN-PSH0PCF" type="ioc" />
+                            <include name="EC-GN-PCF0CORE" type="ioc" />
                         </package>
                         <package name="EC-GN-PCF0SYSM-ioc">
                             <include name="EC-GN-PCF0SYSM" type="ioc" />
@@ -214,4 +214,4 @@ KillSignal=SIGINT]]>
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/ec-gn-ja-pcf-sdd-in b/ec-gn-ja-pcf-sdd-in
index 911a563..0318d20 160000
--- a/ec-gn-ja-pcf-sdd-in
+++ b/ec-gn-ja-pcf-sdd-in
@@ -1 +1 @@
-Subproject commit 911a5632e898b00667bd9e945527c192c1a51299
+Subproject commit 0318d2002e291d68062e86a55f2de4b61db6adef
diff --git a/generate.sh b/generate.sh
index 3e2e146..d1e16c1 100755
--- a/generate.sh
+++ b/generate.sh
@@ -68,6 +68,9 @@ if [[ ${ok} != "0" ]]; then
   cp -rf ${project_name}-IN/.[^.]* ${project_name}/
 #  cp -rf tmp_resources/* ${project_name}/src/main/resources
 #  rm -rf tmp_resources
+  mkdir ${project_name,,}-sdd-in/SDD_IN/templates
+  /bin/cp -f /opt/codac/marte2-extensions/templates/* ${project_name,,}-sdd-in/SDD_IN/templates
+  /bin/cp -f patches/* ${project_name,,}-sdd-in/SDD_IN/templates
 
   cd ${project_name,,}-sdd-in/SDD_IN
   ./sdd-generate.sh
@@ -83,6 +86,13 @@ cd ${current_dir}
 ok=$(echo ${mask} | cut -c ${cid})
 
 #if [[ ${ok} != "0" ]]; then
+  
+#  cat patches/EC-GN-PCF0CORE_sddPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/sddPreDriverConf.cmd > sddPreDriverConf_patched.cmd
+#  mv -f sddPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/sddPreDriverConf.cmd
+
+#  cat patches/EC-GN-PCF0CORE_userPreDriverConf.patch ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/userPreDriverConf.cmd > userPreDriverConf_patched.cmd
+#  mv -f userPreDriverConf_patched.cmd ${project_name}/src/main/epics/iocBoot/iocEC-GN-PCF0CORE/userPreDriverConf.cmd
+
 #fi
 
 cid=$((cid+1))