diff -urNp anjuta-2.24.2.orig/plugins/class-gen/templates/cc-header.tpl anjuta-2.24.2/plugins/class-gen/templates/cc-header.tpl
--- anjuta-2.24.2.orig/plugins/class-gen/templates/cc-header.tpl	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/class-gen/templates/cc-header.tpl	2009-03-16 01:52:54.000000000 +0530
@@ -1,13 +1,13 @@
 [+ autogen5 template +]
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * [+ProjectName+][+IF (=(get "Headings") "1")+]
+ * [+HeaderFile+][+IF (=(get "Headings") "1")+]
  * Copyright (C) [+AuthorName+] [+(shell "date +%Y")+] <[+AuthorEmail+]>[+ENDIF+]
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "LGPL" +][+(lgpl (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "GPL"  +][+(gpl  (get "ProjectName")                    " * ")+]
+[+ == "BSD"  +][+(bsd  (get "HeaderFile") (get "AuthorName") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "HeaderFile") (get "AuthorName") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "HeaderFile")                    " * ")+]
 [+ESAC+] */
 
 #ifndef _[+ (string-upcase(string->c-name!(get "HeaderFile"))) +]_
diff -urNp anjuta-2.24.2.orig/plugins/class-gen/templates/cc-source.tpl anjuta-2.24.2/plugins/class-gen/templates/cc-source.tpl
--- anjuta-2.24.2.orig/plugins/class-gen/templates/cc-source.tpl	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/class-gen/templates/cc-source.tpl	2009-03-16 01:52:25.000000000 +0530
@@ -1,13 +1,13 @@
 [+ autogen5 template +]
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * [+ProjectName+][+IF (=(get "Headings") "1")+]
+ * [+SourceFile+][+IF (=(get "Headings") "1")+]
  * Copyright (C) [+AuthorName+] [+(shell "date +%Y")+] <[+AuthorEmail+]>[+ENDIF+]
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "LGPL" +][+(lgpl (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "GPL"  +][+(gpl  (get "ProjectName")                    " * ")+]
+[+ == "BSD"  +][+(bsd  (get "SourceFile") (get "AuthorName") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "SourceFile") (get "AuthorName") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "SourceFile")                    " * ")+]
 [+ESAC+] */
 
 #include "[+HeaderFile+]"
diff -urNp anjuta-2.24.2.orig/plugins/class-gen/templates/go-header.tpl anjuta-2.24.2/plugins/class-gen/templates/go-header.tpl
--- anjuta-2.24.2.orig/plugins/class-gen/templates/go-header.tpl	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/class-gen/templates/go-header.tpl	2009-03-16 01:53:26.000000000 +0530
@@ -1,13 +1,13 @@
 [+ autogen5 template +]
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * [+ProjectName+][+IF (=(get "Headings") "1")+]
+ * [+HeaderFile+][+IF (=(get "Headings") "1")+]
  * Copyright (C) [+AuthorName+] [+(shell "date +%Y")+] <[+AuthorEmail+]>[+ENDIF+]
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "LGPL" +][+(lgpl (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "GPL"  +][+(gpl  (get "ProjectName")                    " * ")+]
+[+ == "BSD"  +][+(bsd  (get "HeaderFile") (get "AuthorName") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "HeaderFile") (get "AuthorName") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "HeaderFile")                    " * ")+]
 [+ESAC+] */
 
 #ifndef _[+ (string-upcase(string->c-name!(get "HeaderFile"))) +]_
diff -urNp anjuta-2.24.2.orig/plugins/class-gen/templates/go-source.tpl anjuta-2.24.2/plugins/class-gen/templates/go-source.tpl
--- anjuta-2.24.2.orig/plugins/class-gen/templates/go-source.tpl	2009-03-16 01:11:45.000000000 +0530
+++ anjuta-2.24.2/plugins/class-gen/templates/go-source.tpl	2009-03-16 01:53:14.000000000 +0530
@@ -1,13 +1,13 @@
 [+ autogen5 template +]
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * [+ProjectName+][+IF (=(get "Headings") "1")+]
+ * [+SourceFile+][+IF (=(get "Headings") "1")+]
  * Copyright (C) [+AuthorName+] [+(shell "date +%Y")+] <[+AuthorEmail+]>[+ENDIF+]
  * 
 [+CASE (get "License") +]
-[+ == "BSD"  +][+(bsd  (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "LGPL" +][+(lgpl (get "ProjectName") (get "AuthorName") " * ")+]
-[+ == "GPL"  +][+(gpl  (get "ProjectName")                    " * ")+]
+[+ == "BSD"  +][+(bsd  (get "SourceFile") (get "AuthorName") " * ")+]
+[+ == "LGPL" +][+(lgpl (get "SourceFile") (get "AuthorName") " * ")+]
+[+ == "GPL"  +][+(gpl  (get "SourceFile")                    " * ")+]
 [+ESAC+] */
 
 #include "[+HeaderFile+]"[+