--- a/dwtx/jface/text/templates/persistence/TemplateStore.d	Sun Aug 24 21:34:15 2008 +0200
+++ b/dwtx/jface/text/templates/persistence/TemplateStore.d	Sun Aug 24 22:31:00 2008 +0200
@@ -347,11 +347,11 @@
 
         for (Iterator it= fTemplates.iterator(); it.hasNext();) {
             TemplatePersistenceData data= cast(TemplatePersistenceData) it.next();
-            Template template= data.getTemplate();
+            Template template_= data.getTemplate();
             if (data.isEnabled() && !data.isDeleted()
-                    && (contextTypeId is null || contextTypeId.equals(template.getContextTypeId()))
-                    && name.equals(template.getName()))
-                return template;
+                    && (contextTypeId is null || contextTypeId.equals(template_.getContextTypeId()))
+                    && name.equals(template_.getName()))
+                return template_;
         }
 
         return null;
@@ -431,12 +431,12 @@
      *         type registry is specified, <code>false</code> if validation
      *         fails
      */
-    private bool validateTemplate(Template template) {
-        String contextTypeId= template.getContextTypeId();
+    private bool validateTemplate(Template template_) {
+        String contextTypeId= template_.getContextTypeId();
         if (contextExists(contextTypeId)) {
             if (fRegistry !is null)
                 try {
-                    fRegistry.getContextType(contextTypeId).validate(template.getPattern());
+                    fRegistry.getContextType(contextTypeId).validate(template_.getPattern());
                 } catch (TemplateException e) {
                     return false;
                 }