[anjuta] project-wizard: bgo #700318 - Can't build a project whose name starts by a digit

[Sebastien Granjoux <sgranjoux src gnome org>]

commit ee415f03e4ec8f6501ca2d664b57733494566991
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Sat May 18 11:11:23 2013 +0200

    project-wizard: bgo #700318 - Can't build a project whose name starts by a digit

 .../project-wizard/templates/anjuta-plugin.wiz.in  |    2 +-
 plugins/project-wizard/templates/cpp.wiz.in        |    2 +-
 plugins/project-wizard/templates/gcj.wiz.in        |    2 +-
 plugins/project-wizard/templates/gtk.wiz.in        |    2 +-
 .../project-wizard/templates/gtkapplication.wiz.in |    2 +-
 plugins/project-wizard/templates/gtkmm.wiz.in      |    2 +-
 plugins/project-wizard/templates/java.wiz.in       |    2 +-
 plugins/project-wizard/templates/js.wiz.in         |    2 +-
 plugins/project-wizard/templates/library.wiz.in    |    2 +-
 plugins/project-wizard/templates/minimal.wiz.in    |    2 +-
 plugins/project-wizard/templates/pygtk.wiz.in      |    2 +-
 plugins/project-wizard/templates/python.wiz.in     |    2 +-
 plugins/project-wizard/templates/sdl.wiz.in        |    2 +-
 plugins/project-wizard/templates/terminal.wiz.in   |    2 +-
 plugins/project-wizard/templates/vala-gtk.wiz.in   |    2 +-
 plugins/project-wizard/templates/wxwin.wiz.in      |    2 +-
 plugins/project-wizard/templates/xlib-dock.wiz.in  |    2 +-
 plugins/project-wizard/templates/xlib.wiz.in       |    2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/plugins/project-wizard/templates/anjuta-plugin.wiz.in 
b/plugins/project-wizard/templates/anjuta-plugin.wiz.in
index 5d15023..e3b3439 100644
--- a/plugins/project-wizard/templates/anjuta-plugin.wiz.in
+++ b/plugins/project-wizard/templates/anjuta-plugin.wiz.in
@@ -23,7 +23,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="hidden" name="NameCClass" default='[+(string-capitalize! (string-substitute 
(get "Name") "-" ""))+]'/>
diff --git a/plugins/project-wizard/templates/cpp.wiz.in b/plugins/project-wizard/templates/cpp.wiz.in
index 92eeb85..baa774d 100644
--- a/plugins/project-wizard/templates/cpp.wiz.in
+++ b/plugins/project-wizard/templates/cpp.wiz.in
@@ -21,7 +21,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="boolean" name="HaveSharedlib" _label="Add shared library support:" 
_description="Adds support for building shared libraries in your project" default="1"/>
diff --git a/plugins/project-wizard/templates/gcj.wiz.in b/plugins/project-wizard/templates/gcj.wiz.in
index b1f57e2..e9c8703 100644
--- a/plugins/project-wizard/templates/gcj.wiz.in
+++ b/plugins/project-wizard/templates/gcj.wiz.in
@@ -24,7 +24,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="hidden" name="HavePackage" default="0"/>
diff --git a/plugins/project-wizard/templates/gtk.wiz.in b/plugins/project-wizard/templates/gtk.wiz.in
index 5a858b9..2382c46 100644
--- a/plugins/project-wizard/templates/gtk.wiz.in
+++ b/plugins/project-wizard/templates/gtk.wiz.in
@@ -23,7 +23,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="hidden" name="HavePackage" default="1"/>
diff --git a/plugins/project-wizard/templates/gtkapplication.wiz.in 
b/plugins/project-wizard/templates/gtkapplication.wiz.in
index 4e2c76a..29eb901 100644
--- a/plugins/project-wizard/templates/gtkapplication.wiz.in
+++ b/plugins/project-wizard/templates/gtkapplication.wiz.in
@@ -23,7 +23,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="hidden" name="NameCClass" default='[+(string-capitalize! (string-substitute 
(get "Name") "-" ""))+]'/>
diff --git a/plugins/project-wizard/templates/gtkmm.wiz.in b/plugins/project-wizard/templates/gtkmm.wiz.in
index 97d9fc5..bfdb63c 100644
--- a/plugins/project-wizard/templates/gtkmm.wiz.in
+++ b/plugins/project-wizard/templates/gtkmm.wiz.in
@@ -23,7 +23,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="hidden" name="HavePackage" default="1"/>
diff --git a/plugins/project-wizard/templates/java.wiz.in b/plugins/project-wizard/templates/java.wiz.in
index 1134a7b..b6e81ef 100644
--- a/plugins/project-wizard/templates/java.wiz.in
+++ b/plugins/project-wizard/templates/java.wiz.in
@@ -24,7 +24,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="boolean" name="HaveSharedlib" _label="Add shared library support:" 
_description="Adds support for building shared libraries in your project" default="1"/>
diff --git a/plugins/project-wizard/templates/js.wiz.in b/plugins/project-wizard/templates/js.wiz.in
index 1aa67b8..b0c92e9 100644
--- a/plugins/project-wizard/templates/js.wiz.in
+++ b/plugins/project-wizard/templates/js.wiz.in
@@ -21,7 +21,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
        </page>
diff --git a/plugins/project-wizard/templates/library.wiz.in b/plugins/project-wizard/templates/library.wiz.in
index f7ebdb4..9c4eae1 100644
--- a/plugins/project-wizard/templates/library.wiz.in
+++ b/plugins/project-wizard/templates/library.wiz.in
@@ -22,7 +22,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="list" name="LibraryType" _label="Build library as" _description="Select 
library type to build" default="Both" editable="no">
diff --git a/plugins/project-wizard/templates/minimal.wiz.in b/plugins/project-wizard/templates/minimal.wiz.in
index 6b9fa83..46a96ea 100644
--- a/plugins/project-wizard/templates/minimal.wiz.in
+++ b/plugins/project-wizard/templates/minimal.wiz.in
@@ -22,7 +22,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="boolean" name="HaveLangCPP" _label="Add C++ support:" _description="Adds C++ 
support to the project so that C++ source files can be built" default="0"/>
diff --git a/plugins/project-wizard/templates/pygtk.wiz.in b/plugins/project-wizard/templates/pygtk.wiz.in
index 925c5ea..df495c0 100644
--- a/plugins/project-wizard/templates/pygtk.wiz.in
+++ b/plugins/project-wizard/templates/pygtk.wiz.in
@@ -25,7 +25,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="boolean" name="HaveI18n" _label="Add internationalization:" 
_description="Adds support for internationalization so that your project can have translations in different 
languages" default="0"/>
diff --git a/plugins/project-wizard/templates/python.wiz.in b/plugins/project-wizard/templates/python.wiz.in
index 7f40729..645cd10 100644
--- a/plugins/project-wizard/templates/python.wiz.in
+++ b/plugins/project-wizard/templates/python.wiz.in
@@ -23,7 +23,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="hidden" name="HavePackage" default="0"/>
diff --git a/plugins/project-wizard/templates/sdl.wiz.in b/plugins/project-wizard/templates/sdl.wiz.in
index 2d67c05..078d762 100644
--- a/plugins/project-wizard/templates/sdl.wiz.in
+++ b/plugins/project-wizard/templates/sdl.wiz.in
@@ -20,7 +20,7 @@
        <page name="options" _label="Project options" _description="Options for project build system">
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="directory" name="Destination" _label="Destination:" _description="" 
default='[+AnjutaProjectDirectory+]/[+(string-downcase (get "Name"))+]' mandatory="yes" exist="no" 
summary="yes"/>
diff --git a/plugins/project-wizard/templates/terminal.wiz.in 
b/plugins/project-wizard/templates/terminal.wiz.in
index 938d691..347e2e0 100644
--- a/plugins/project-wizard/templates/terminal.wiz.in
+++ b/plugins/project-wizard/templates/terminal.wiz.in
@@ -22,7 +22,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="boolean" name="HaveSharedlib" _label="Add shared library support:" 
_description="Adds support for building shared libraries in your project" default="1"/>
diff --git a/plugins/project-wizard/templates/vala-gtk.wiz.in 
b/plugins/project-wizard/templates/vala-gtk.wiz.in
index d8f1d34..cae4355 100644
--- a/plugins/project-wizard/templates/vala-gtk.wiz.in
+++ b/plugins/project-wizard/templates/vala-gtk.wiz.in
@@ -24,7 +24,7 @@
                [+INCLUDE "licenses.tpl"+]
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="hidden" name="HavePackage" default="1"/>
diff --git a/plugins/project-wizard/templates/wxwin.wiz.in b/plugins/project-wizard/templates/wxwin.wiz.in
index 691eb82..a90cb67 100644
--- a/plugins/project-wizard/templates/wxwin.wiz.in
+++ b/plugins/project-wizard/templates/wxwin.wiz.in
@@ -19,7 +19,7 @@
        <page name="options" _label="Project options" _description="Options for project build system">
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="directory" name="Destination" _label="Destination:" _description="" 
default='[+AnjutaProjectDirectory+]/[+(string-downcase (get "Name"))+]' mandatory="yes" exist="no" 
summary="yes"/>
diff --git a/plugins/project-wizard/templates/xlib-dock.wiz.in 
b/plugins/project-wizard/templates/xlib-dock.wiz.in
index 81275d8..893c64d 100644
--- a/plugins/project-wizard/templates/xlib-dock.wiz.in
+++ b/plugins/project-wizard/templates/xlib-dock.wiz.in
@@ -20,7 +20,7 @@
        <page name="options" _label="Project options" _description="Options for project build system">
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="hidden" name="HavePackage" default="1"/>
diff --git a/plugins/project-wizard/templates/xlib.wiz.in b/plugins/project-wizard/templates/xlib.wiz.in
index aa66afb..94a7b8c 100644
--- a/plugins/project-wizard/templates/xlib.wiz.in
+++ b/plugins/project-wizard/templates/xlib.wiz.in
@@ -20,7 +20,7 @@
        <page name="options" _label="Project options" _description="Options for project build system">
                <property type="hidden" name="NameUpper" default='[+(string-upcase (get "Name"))+]'/>
                <property type="hidden" name="NameLower" default='[+(string-downcase (get "Name"))+]'/>
-               <property type="hidden" name="NameCUpper" default='[+(string->c-name! (string-substitute 
(string-upcase (get "Name")) " " "_"))+]'/>
+               <property type="hidden" name="NameCUpper" default='[+(string-append (if (~~* (get "Name") 
"[0-9]") "_" "") (string->c-name! (string-substitute (string-upcase (get "Name")) " " "_")))+]'/>
                <property type="hidden" name="NameCLower" default='[+(string->c-name! (string-substitute 
(string-downcase (get "Name")) " " "_"))+]'/>
                <property type="hidden" name="NameHLower" default='[+(string-substitute (string->c-name! 
(string-downcase (get "Name"))) " " "-")+]'/>
                <property type="hidden" name="HavePackage" default="1"/>