diff --git a/build-root/emacs-lisp/README b/build-root/emacs-lisp/README
index 7dac8a0..483e1c3 100644
--- a/build-root/emacs-lisp/README
+++ b/build-root/emacs-lisp/README
@@ -27,35 +27,35 @@
    M-x plugin-configure-skel
    
    M-x find-file <plugin-name>-plugin/Makefile.am
-   M-x plugin-makefile.skel
+   M-x skel-plugin-makefile
 
 5. Create the api skeleton
    M-x find-file <plugin-name>-plugin/<plugin-name>/<plugin-name>.api
-   M-x plugin-api-skel
+   M-x skel-plugin-api
 
 6. Create the api message enumeration header file
    M-x find-file <plugin-name>-plugin/<plugin-name>/<plugin-name>_msg_enum.h
-   M-x plugin-msg-enum-skel
+   M-x skel-plugin-msg-enum
 
 7. Create the "all-api" header file
    M-x find-file <plugin-name>-plugin/<plugin-name>/<plugin-name>_all_api_h.h
-   M-x plugin-all-apih-skel
+   M-x skel-plugin-all-apih
 
 8. Create the main data structure definition header file
    M-x find-file <plugin-name>-plugin/<plugin-name>/<plugin-name>.h
-   M-x plugin-h-skel
+   M-x skel-plugin-h
 
 9. Create the plugin main C file
    M-x find-file <plugin-name>-plugin/<plugin-name>/<plugin-name>.c
-   M-x plugin-main-skel
+   M-x skel-plugin-main
 
 10. Create the vpp-api-test plugin main C file
    M-x find-file <plugin-name>-plugin/<plugin-name>/<plugin-name>_test.c
-   M-x plugin-test-skel
+   M-x skel-plugin-test
 
 11. Create the data plane packet processing node
    M-x find-file <plugin-name>-plugin/<plugin-name>/node.c
-   M-x plugin-node-skel
+   M-x skel-plugin-node
 
 12. Process autotools input files
 
diff --git a/build-root/emacs-lisp/cli-cmd-skel.el b/build-root/emacs-lisp/cli-cmd-skel.el
index 8a83cd1..cf8658c 100644
--- a/build-root/emacs-lisp/cli-cmd-skel.el
+++ b/build-root/emacs-lisp/cli-cmd-skel.el
@@ -2,7 +2,7 @@
 
 (require 'skeleton)
 
-(define-skeleton cli-cmd-skel
+(define-skeleton skel-cli-cmd
 "Insert a CLI command "
 nil
 '(setq cmd-name (skeleton-read "Command Name: "))
diff --git a/build-root/emacs-lisp/config-skel.el b/build-root/emacs-lisp/config-skel.el
index c9a1eb6..dc2ec38 100644
--- a/build-root/emacs-lisp/config-skel.el
+++ b/build-root/emacs-lisp/config-skel.el
@@ -2,7 +2,7 @@
 
 (require 'skeleton)
 
-(define-skeleton config-skel
+(define-skeleton skel-config
 "Insert a vlib config skeleton "
 nil
 '(setq cfg-name (skeleton-read "Config Class Name: "))
diff --git a/build-root/emacs-lisp/dual-loop-skel.el b/build-root/emacs-lisp/dual-loop-skel.el
index 87a50cc..b23d65a 100644
--- a/build-root/emacs-lisp/dual-loop-skel.el
+++ b/build-root/emacs-lisp/dual-loop-skel.el
@@ -2,7 +2,7 @@
 
 (require 'skeleton)
 
-(define-skeleton dual-loop-skel
+(define-skeleton skel-dual-loop
 "Insert a skeleton dual-loop graph node"
 nil
 '(setq node-name (skeleton-read "Node Name: "))
diff --git a/build-root/emacs-lisp/periodic-skel.el b/build-root/emacs-lisp/periodic-skel.el
index 37c2085..a8f3ef6 100644
--- a/build-root/emacs-lisp/periodic-skel.el
+++ b/build-root/emacs-lisp/periodic-skel.el
@@ -2,7 +2,7 @@
 
 (require 'skeleton)
 
-(define-skeleton periodic-skel
+(define-skeleton skel-periodic
 "Insert a skeleton periodic process node"
 nil
 '(setq node-name (skeleton-read "Name: "))
diff --git a/build-root/emacs-lisp/pipe-skel.el b/build-root/emacs-lisp/pipe-skel.el
index bda6e97..911e0d0 100644
--- a/build-root/emacs-lisp/pipe-skel.el
+++ b/build-root/emacs-lisp/pipe-skel.el
@@ -2,7 +2,7 @@
 
 (require 'skeleton)
 
-(define-skeleton pipeline-node-skel
+(define-skeleton skel-pipeline-node
 "Insert a skeleton pipelined graph node"
 nil
 '(setq node-name (skeleton-read "Node Name: "))
diff --git a/build-root/emacs-lisp/plugin-all-apih-skel.el b/build-root/emacs-lisp/plugin-all-apih-skel.el
index 8cc74b8..0f073f9 100644
--- a/build-root/emacs-lisp/plugin-all-apih-skel.el
+++ b/build-root/emacs-lisp/plugin-all-apih-skel.el
@@ -15,7 +15,7 @@
 
 (require 'skeleton)
 
-(define-skeleton plugin-all-apih-skel
+(define-skeleton skel-plugin-all-apih
 "Insert a plug-in 'all_api_h.h' skeleton "
 nil
 '(if (not (boundp 'plugin-name))
diff --git a/build-root/emacs-lisp/plugin-api-skel.el b/build-root/emacs-lisp/plugin-api-skel.el
index c838844..74519e7 100644
--- a/build-root/emacs-lisp/plugin-api-skel.el
+++ b/build-root/emacs-lisp/plugin-api-skel.el
@@ -15,7 +15,7 @@
 
 (require 'skeleton)
 
-(define-skeleton plugin-api-skel
+(define-skeleton skel-plugin-api
 "Insert a plug-in '<name>.api' skeleton "
 nil
 '(if (not (boundp 'plugin-name))
diff --git a/build-root/emacs-lisp/plugin-configure-skel.el b/build-root/emacs-lisp/plugin-configure-skel.el
index 8f91f10..d871323 100644
--- a/build-root/emacs-lisp/plugin-configure-skel.el
+++ b/build-root/emacs-lisp/plugin-configure-skel.el
@@ -15,7 +15,7 @@
 
 (require 'skeleton)
 
-(define-skeleton plugin-configure-skel
+(define-skeleton skel-plugin-configure
 "Insert a plug-in 'configure.ac' skeleton "
 nil
 '(if (not (boundp 'plugin-name))
diff --git a/build-root/emacs-lisp/plugin-h-skel.el b/build-root/emacs-lisp/plugin-h-skel.el
index 74e32c0..8bf9b6f 100644
--- a/build-root/emacs-lisp/plugin-h-skel.el
+++ b/build-root/emacs-lisp/plugin-h-skel.el
@@ -15,7 +15,7 @@
 
 (require 'skeleton)
 
-(define-skeleton plugin-h-skel
+(define-skeleton skel-plugin-h
 "Insert a plug-in 'main.c' skeleton "
 nil
 '(if (not (boundp 'plugin-name))
diff --git a/build-root/emacs-lisp/plugin-main-skel.el b/build-root/emacs-lisp/plugin-main-skel.el
index e9bd3b5..0c9cd51 100644
--- a/build-root/emacs-lisp/plugin-main-skel.el
+++ b/build-root/emacs-lisp/plugin-main-skel.el
@@ -15,7 +15,7 @@
 
 (require 'skeleton)
 
-(define-skeleton plugin-main-skel
+(define-skeleton skel-plugin-main
 "Insert a plug-in 'main.c' skeleton "
 nil
 '(if (not (boundp 'plugin-name))
diff --git a/build-root/emacs-lisp/plugin-makefile-skel.el b/build-root/emacs-lisp/plugin-makefile-skel.el
index 390f4a4..1c04323 100644
--- a/build-root/emacs-lisp/plugin-makefile-skel.el
+++ b/build-root/emacs-lisp/plugin-makefile-skel.el
@@ -15,7 +15,7 @@
 
 (require 'skeleton)
 
-(define-skeleton plugin-makefile-skel
+(define-skeleton skel-plugin-makefile
 "Insert a plug-in 'Makefile.am' skeleton "
 nil
 '(if (not (boundp 'plugin-name))
diff --git a/build-root/emacs-lisp/plugin-msg-enum-skel.el b/build-root/emacs-lisp/plugin-msg-enum-skel.el
index ef0348b..c44af05 100644
--- a/build-root/emacs-lisp/plugin-msg-enum-skel.el
+++ b/build-root/emacs-lisp/plugin-msg-enum-skel.el
@@ -15,7 +15,7 @@
 
 (require 'skeleton)
 
-(define-skeleton plugin-msg-enum-skel
+(define-skeleton skel-plugin-msg-enum
 "Insert a plug-in message enumeration skeleton "
 nil
 '(if (not (boundp 'plugin-name))
diff --git a/build-root/emacs-lisp/plugin-node-skel.el b/build-root/emacs-lisp/plugin-node-skel.el
index 03ebedd..0d88a2e 100644
--- a/build-root/emacs-lisp/plugin-node-skel.el
+++ b/build-root/emacs-lisp/plugin-node-skel.el
@@ -15,7 +15,7 @@
 
 (require 'skeleton)
 
-(define-skeleton plugin-node-skel
+(define-skeleton skel-plugin-node
 "Insert a plug-in 'node.c' skeleton "
 nil
 '(if (not (boundp 'plugin-name))
diff --git a/build-root/emacs-lisp/plugin-test-skel.el b/build-root/emacs-lisp/plugin-test-skel.el
index 9d2374b..5231a23 100644
--- a/build-root/emacs-lisp/plugin-test-skel.el
+++ b/build-root/emacs-lisp/plugin-test-skel.el
@@ -15,7 +15,7 @@
 
 (require 'skeleton)
 
-(define-skeleton plugin-test-skel
+(define-skeleton skel-plugin-test
 "Insert a plug-in vpp-api-test skeleton "
 nil
 '(if (not (boundp 'plugin-name))
diff --git a/build-root/emacs-lisp/plugin.el b/build-root/emacs-lisp/plugin.el
index 4c24e7d..006ae54 100644
--- a/build-root/emacs-lisp/plugin.el
+++ b/build-root/emacs-lisp/plugin.el
@@ -13,23 +13,23 @@
       (setq cd-args (concat start-dir plugin-name "-plugin"))
       (setq default-directory cd-args)
       (find-file "Makefile.am")
-      (plugin-makefile-skel)
+      (skel-plugin-makefile)
       (find-file "configure.ac")
-      (plugin-configure-skel)
+      (skel-plugin-configure)
       (setq default-directory (concat cd-args "/" plugin-name))
       (find-file (concat plugin-name ".api"))
-      (plugin-api-skel)
+      (skel-plugin-api)
       (find-file (concat plugin-name "_all_api_h.h"))
-      (plugin-all-apih-skel)
+      (skel-plugin-all-apih)
       (find-file (concat plugin-name ".h"))
-      (plugin-h-skel)
+      (skel-plugin-h)
       (find-file (concat plugin-name ".c"))
-      (plugin-main-skel)
+      (skel-plugin-main)
       (find-file (concat plugin-name "_msg_enum.h"))
-      (plugin-msg-enum-skel)
+      (skel-plugin-msg-enum)
       (find-file "node.c")
-      (plugin-node-skel)
+      (skel-plugin-node)
       (find-file (concat plugin-name "_test.c"))
-      (plugin-test-skel)
+      (skel-plugin-test)
       (cd start-dir))))
 
diff --git a/build-root/emacs-lisp/tunnel-c-skel.el b/build-root/emacs-lisp/tunnel-c-skel.el
index 6f1096c..199e27f 100644
--- a/build-root/emacs-lisp/tunnel-c-skel.el
+++ b/build-root/emacs-lisp/tunnel-c-skel.el
@@ -2,7 +2,7 @@
 
 (require 'skeleton)
 
-(define-skeleton tunnel-c-skel
+(define-skeleton skel-tunnel-c
 "Insert a tunnel cli/api implementation"
 nil
 '(setq encap_stack (skeleton-read "encap_stack (e.g ip4_udp_lisp): "))
diff --git a/build-root/emacs-lisp/tunnel-decap-skel.el b/build-root/emacs-lisp/tunnel-decap-skel.el
index fc6f3a1..380273b 100644
--- a/build-root/emacs-lisp/tunnel-decap-skel.el
+++ b/build-root/emacs-lisp/tunnel-decap-skel.el
@@ -2,7 +2,7 @@
 
 (require 'skeleton)
 
-(define-skeleton tunnel-decap-skel
+(define-skeleton skel-tunnel-decap
 "Insert a tunnel decap implementation"
 nil
 '(setq encap_stack (skeleton-read "encap_stack (e.g ip4_udp_lisp): "))
diff --git a/build-root/emacs-lisp/tunnel-encap-skel.el b/build-root/emacs-lisp/tunnel-encap-skel.el
index baf8241..9c98a59 100644
--- a/build-root/emacs-lisp/tunnel-encap-skel.el
+++ b/build-root/emacs-lisp/tunnel-encap-skel.el
@@ -2,7 +2,7 @@
 
 (require 'skeleton)
 
-(define-skeleton tunnel-encap-skel
+(define-skeleton skel-tunnel-encap
 "Insert a tunnel encap implementation"
 nil
 '(setq encap_stack (skeleton-read "encap_stack (e.g ip4_udp_lisp): "))
diff --git a/build-root/emacs-lisp/tunnel-h-skel.el b/build-root/emacs-lisp/tunnel-h-skel.el
index f03d040..067cf13 100644
--- a/build-root/emacs-lisp/tunnel-h-skel.el
+++ b/build-root/emacs-lisp/tunnel-h-skel.el
@@ -2,7 +2,7 @@
 
 (require 'skeleton)
 
-(define-skeleton tunnel-h-skel
+(define-skeleton skel-tunnel-h
 "Insert a tunnel encap header file"
 nil
 '(setq encap_stack (skeleton-read "encap_stack (e.g ip4_udp_lisp): "))