diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf
index ca85cdf52..612dc374f 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf
@@ -108,73 +108,73 @@ kitrepo:
 #                         preinstall, postinstall, preuninstall, postuninstall, 
 #                         preupgrade, postupgrade, postbootscripts
 kitcomponent:
-    basename=teal-base
+    basename=teal_base
     description=teal for management nodes
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
     kitpkgdeps=teal-base
 
 kitcomponent:
-    basename=teal-gpfs
+    basename=teal_gpfs
     description=teal for gpfs
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-gpfs,teal-gpfs-sn
 
 kitcomponent:
-    basename=teal-ib
+    basename=teal_ib
     description=teal for ib
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-ib
 
 kitcomponent:
-    basename=teal-isnm
+    basename=teal_isnm
     description=teal for isnm 
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-isnm
 
 kitcomponent:
-    basename=teal-ll
+    basename=teal_ll
     description=teal for pnsd 
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-isnm
 
 kitcomponent:
-    basename=teal-pnsd
+    basename=teal_pnsd
     description=teal for pnsd
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
     kitpkgdeps=teal-pnsd
 
 kitcomponent:
-    basename=teal-sfp
+    basename=teal_sfp
     description=teal for sfp
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64 
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-sfp
 
 kitcomponent:
-    basename=teal-syslog
+    basename=teal_syslog
     description=teal for syslog
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-syslog
 
 kitcomponent:
-    basename=teal-test
+    basename=teal_test
     description=teal test
     serverroles=mgtnode
     kitrepoid=rhels6_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-test
 
 # kitpackage: This section defines one Kit Package, and how to build it.
diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf
index fd422f648..421c256cf 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf
+++ b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf
@@ -108,75 +108,74 @@ kitrepo:
 #                         preinstall, postinstall, preuninstall, postuninstall, 
 #                         preupgrade, postupgrade, postbootscripts
 kitcomponent:
-    basename=teal-base
+    basename=teal_base
     description=teal for management nodes
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
     kitpkgdeps=teal-base
 
 kitcomponent:
-    basename=teal-gpfs
+    basename=teal_gpfs
     description=teal for gpfs
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-gpfs,teal-gpfs-sn
 
 kitcomponent:
-    basename=teal-ib
+    basename=teal_ib
     description=teal for ib
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-ib
 
 kitcomponent:
-    basename=teal-isnm
+    basename=teal_isnm
     description=teal for isnm
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-isnm 
 
 kitcomponent:
-    basename=teal-ll
+    basename=teal_ll
     description=teal for pnsd
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-isnm 
 
 kitcomponent:
-    basename=teal-pnsd
+    basename=teal_pnsd
     description=teal for pnsd
     serverroles=mgtnode
     kitrepoid=sles11_x86_64 
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-pnsd
 
 kitcomponent:
-    basename=teal-sfp
+    basename=teal_sfp
     description=teal for sfp
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-sfp
 
 kitcomponent:
-    basename=teal-syslog
+    basename=teal_syslog
     description=teal for syslog
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-syslog
 
 kitcomponent:
-    basename=teal-test
+    basename=teal_test
     description=teal test
     serverroles=mgtnode
     kitrepoid=sles11_x86_64
-    kitcompdeps=teal-base
+    kitcompdeps=teal_base
     kitpkgdeps=teal-test
 
 # kitpackage: This section defines one Kit Package, and how to build it.