Index: src/grails/templates/scaffolding/create.gsp
===================================================================
--- src/grails/templates/scaffolding/create.gsp	(revision 7623)
+++ src/grails/templates/scaffolding/create.gsp	(working copy)
@@ -4,15 +4,15 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Create ${className}</title>         
+        <title>Create ${naturalClassName}</title>         
     </head>
     <body>
         <div class="nav">
             <span class="menuButton"><a class="home" href="\${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">${className} List</g:link></span>
+            <span class="menuButton"><g:link class="list" action="list">${naturalClassName} List</g:link></span>
         </div>
         <div class="body">
-            <h1>Create ${className}</h1>
+            <h1>Create ${naturalClassName}</h1>
             <g:if test="\${flash.message}">
             <div class="message">\${flash.message}</div>
             </g:if>
@@ -45,7 +45,7 @@
                                 <td valign="top" class="name">
                                     <label for="${p.name}">${p.naturalName}:</label>
                                 </td>
-                                <td valign="top" class="value \${hasErrors(bean:${propertyName},field:'${p.name}','errors')}">
+                                <td valign="top" class="value \${hasErrors(bean:${domainClass.propertyName},field:'${p.name}','errors')}">
                                     ${renderEditor(p)}
                                 </td>
                             </tr> 
Index: src/grails/templates/scaffolding/edit.gsp
===================================================================
--- src/grails/templates/scaffolding/edit.gsp	(revision 7623)
+++ src/grails/templates/scaffolding/edit.gsp	(working copy)
@@ -4,16 +4,16 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Edit ${className}</title>
+        <title>Edit ${naturalClassName}</title>
     </head>
     <body>
         <div class="nav">
             <span class="menuButton"><a class="home" href="\${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">${className} List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New ${className}</g:link></span>
+            <span class="menuButton"><g:link class="list" action="list">${naturalClassName} List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New ${naturalClassName}</g:link></span>
         </div>
         <div class="body">
-            <h1>Edit ${className}</h1>
+            <h1>Edit ${naturalClassName}</h1>
             <g:if test="\${flash.message}">
             <div class="message">\${flash.message}</div>
             </g:if>
@@ -45,7 +45,7 @@
                                 <td valign="top" class="name">
                                     <label for="${p.name}">${p.naturalName}:</label>
                                 </td>
-                                <td valign="top" class="value \${hasErrors(bean:${propertyName},field:'${p.name}','errors')}">
+                                <td valign="top" class="value \${hasErrors(bean:${domainClass.propertyName},field:'${p.name}','errors')}">
                                     ${renderEditor(p)}
                                 </td>
                             </tr> 
Index: src/grails/templates/scaffolding/list.gsp
===================================================================
--- src/grails/templates/scaffolding/list.gsp	(revision 7623)
+++ src/grails/templates/scaffolding/list.gsp	(working copy)
@@ -4,15 +4,15 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>${className} List</title>
+        <title>${naturalClassName} List</title>
     </head>
     <body>
         <div class="nav">
             <span class="menuButton"><a class="home" href="\${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="create" action="create">New ${className}</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New ${naturalClassName}</g:link></span>
         </div>
         <div class="body">
-            <h1>${className} List</h1>
+            <h1>${naturalClassName} List</h1>
             <g:if test="\${flash.message}">
             <div class="message">\${flash.message}</div>
             </g:if>
@@ -53,7 +53,7 @@
                 </table>
             </div>
             <div class="paginateButtons">
-                <g:paginate total="\${${className}.count()}" />
+                <g:paginate total="\${${shortClassName}.count()}" />
             </div>
         </div>
     </body>
Index: src/grails/templates/scaffolding/show.gsp
===================================================================
--- src/grails/templates/scaffolding/show.gsp	(revision 7623)
+++ src/grails/templates/scaffolding/show.gsp	(working copy)
@@ -4,16 +4,16 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Show ${className}</title>
+        <title>Show ${naturalClassName}</title>
     </head>
     <body>
         <div class="nav">
             <span class="menuButton"><a class="home" href="\${createLinkTo(dir:'')}">Home</a></span>
-            <span class="menuButton"><g:link class="list" action="list">${className} List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New ${className}</g:link></span>
+            <span class="menuButton"><g:link class="list" action="list">${naturalClassName} List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New ${naturalClassName}</g:link></span>
         </div>
         <div class="body">
-            <h1>Show ${className}</h1>
+            <h1>Show ${naturalClassName}</h1>
             <g:if test="\${flash.message}">
             <div class="message">\${flash.message}</div>
             </g:if>
Index: src/scaffolding/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.groovy
===================================================================
--- src/scaffolding/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.groovy	(revision 7623)
+++ src/scaffolding/org/codehaus/groovy/grails/scaffolding/DefaultGrailsTemplateGenerator.groovy	(working copy)
@@ -157,7 +157,8 @@
         def binding = [packageName: packageName,
                 domainClass: domainClass,
                 multiPart: multiPart,
-                className: domainClass.shortName,
+                naturalClassName:domainClass.naturalName,
+                shortClassName:domainClass.shortName,
                 propertyName:  getPropertyName(domainClass),
                 renderEditor: renderEditor,
                 comparator: org.codehaus.groovy.grails.scaffolding.DomainClassPropertyComparator.class]

