diff --git a/gwt-json-overlay/src/main/resources/com/webcohesion/enunciate/modules/gwt_json_overlay/gwt-type.fmt b/gwt-json-overlay/src/main/resources/com/webcohesion/enunciate/modules/gwt_json_overlay/gwt-type.fmt
index 084057042..5a0149f55 100644
--- a/gwt-json-overlay/src/main/resources/com/webcohesion/enunciate/modules/gwt_json_overlay/gwt-type.fmt
+++ b/gwt-json-overlay/src/main/resources/com/webcohesion/enunciate/modules/gwt_json_overlay/gwt-type.fmt
@@ -61,28 +61,28 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
   /**
    * ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public final ${classnameFor(member)} get${member.simpleName.toString()?cap_first}() {
-    return ${classnameFor(member)}.fromString(get${member.simpleName.toString()?cap_first}Internal());
+  public final ${classnameFor(member)} get${member.simpleNameString?cap_first}() {
+    return ${classnameFor(member)}.fromString(get${member.simpleNameString?cap_first}Internal());
   }
 
   /**
    * ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public final void set${member.simpleName.toString()?cap_first}(${classnameFor(member)} ${member.simpleName}) {
-    set${member.simpleName.toString()?cap_first}Internal(${member.simpleName} == null ? null : ${member.simpleName}.toString());
+  public final void set${member.simpleNameString?cap_first}(${classnameFor(member)} ${member.simpleName}) {
+    set${member.simpleNameString?cap_first}Internal(${member.simpleName} == null ? null : ${member.simpleName}.toString());
   }
 
   /**
    * Internal (native) getter for the enum property ${member.simpleName}.
    */
-  private final native String get${member.simpleName.toString()?cap_first}Internal() /*-{
+  private final native String get${member.simpleNameString?cap_first}Internal() /*-{
     return this.${member.name};
   }-*/;
 
   /**
    * Internal (native) setter for the enum property ${member.simpleName}.
    */
-  private final native void set${member.simpleName.toString()?cap_first}Internal(String ${member.simpleName}) /*-{
+  private final native void set${member.simpleNameString?cap_first}Internal(String ${member.simpleName}) /*-{
     this.${member.name} = ${member.simpleName};
   }-*/;
     [#elseif !member.adapted && member.bareAccessorType.enum!false]
@@ -90,8 +90,8 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
   /**
    * ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public final ${classnameFor(member.bareAccessorType)}[] get${member.simpleName.toString()?cap_first}() {
-    com.google.gwt.core.client.JsArrayString _rawItems = get${member.simpleName.toString()?cap_first}Internal();
+  public final ${classnameFor(member.bareAccessorType)}[] get${member.simpleNameString?cap_first}() {
+    com.google.gwt.core.client.JsArrayString _rawItems = get${member.simpleNameString?cap_first}Internal();
     ${classnameFor(member.bareAccessorType)}[] _items = new ${classnameFor(member.bareAccessorType)}[_rawItems.length()];
     for (int i = 0; i < _rawItems.length(); i++) {
       _items[i] = ${classnameFor(member.bareAccessorType)}.fromString(_rawItems.get(i));
@@ -102,25 +102,25 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
   /**
    * ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public final void set${member.simpleName.toString()?cap_first}(${classnameFor(member.bareAccessorType)}[] ${member.simpleName}) {
+  public final void set${member.simpleNameString?cap_first}(${classnameFor(member.bareAccessorType)}[] ${member.simpleName}) {
     com.google.gwt.core.client.JsArrayString _rawItems = (com.google.gwt.core.client.JsArrayString) com.google.gwt.core.client.JavaScriptObject.createArray();
     for (int i = 0; i < ${member.simpleName}.length; i++) {
       _rawItems.set(i, ${member.simpleName}[i] == null ? null : ${member.simpleName}[i].toString());
     }
-    set${member.simpleName.toString()?cap_first}Internal(_rawItems);
+    set${member.simpleNameString?cap_first}Internal(_rawItems);
   }
 
   /**
    * Internal (native) getter for the enum property ${member.simpleName}.
    */
-  private final native com.google.gwt.core.client.JsArrayString get${member.simpleName.toString()?cap_first}Internal() /*-{
+  private final native com.google.gwt.core.client.JsArrayString get${member.simpleNameString?cap_first}Internal() /*-{
     return this.${member.name};
   }-*/;
 
   /**
    * Internal (native) setter for the enum property ${member.simpleName}.
    */
-  private final native void set${member.simpleName.toString()?cap_first}Internal(com.google.gwt.core.client.JsArrayString ${member.simpleName}) /*-{
+  private final native void set${member.simpleNameString?cap_first}Internal(com.google.gwt.core.client.JsArrayString ${member.simpleName}) /*-{
     this.${member.name} = ${member.simpleName};
   }-*/;
     [#elseif isAccessorOfTypeLong(member)]
@@ -128,14 +128,14 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
   /**
    * ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public final native Long get${member.simpleName.toString()?cap_first}() /*-{
+  public final native Long get${member.simpleNameString?cap_first}() /*-{
     return (this.${member.name} == null ? null : @java.lang.Long::valueOf(Ljava/lang/String;)(this.${member.name} + ''));
   }-*/;
 
   /**
    * ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public final native void set${member.simpleName.toString()?cap_first}(${classnameFor(member)} ${member.simpleName}) /*-{
+  public final native void set${member.simpleNameString?cap_first}(${classnameFor(member)} ${member.simpleName}) /*-{
     this.${member.name} = (${member.simpleName} == null ? null : (+(@java.lang.String::valueOf(Ljava/lang/Object;)(${member.simpleName}))));
   }-*/;
     [#else]
@@ -143,14 +143,14 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
   /**
    * ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public final native ${classnameFor(member)} get${member.simpleName.toString()?cap_first}() /*-{
+  public final native ${classnameFor(member)} get${member.simpleNameString?cap_first}() /*-{
     return this.${member.name};
   }-*/;
 
   /**
    * ${(member.javaDoc.return!member.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public final native void set${member.simpleName.toString()?cap_first}(${classnameFor(member)} ${member.simpleName}) /*-{
+  public final native void set${member.simpleNameString?cap_first}(${classnameFor(member)} ${member.simpleName}) /*-{
     this.${member.name} = ${member.simpleName};
   }-*/;
       [#if member.referencesQNameEnum!false]
@@ -160,8 +160,8 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
    *
    * @see ${classnameFor(member.QNameEnumRef)}#convertFromKnownQName
    */
-  public final ${classnameFor(member.QNameEnumRef)} getKnown${member.simpleName.toString()?cap_first}() {
-    return ${classnameFor(member.QNameEnumRef)}.convertFromKnownQName(get${member.simpleName.toString()?cap_first}());
+  public final ${classnameFor(member.QNameEnumRef)} getKnown${member.simpleNameString?cap_first}() {
+    return ${classnameFor(member.QNameEnumRef)}.convertFromKnownQName(get${member.simpleNameString?cap_first}());
   }
 
   /**
@@ -169,8 +169,8 @@ public class ${simpleNameFor(type)} [#if !baseobject]extends ${classnameFor(type
    *
    * @see ${classnameFor(member.QNameEnumRef)}#convertToKnownQName
    */
-  public final void setKnown${member.simpleName.toString()?cap_first}(${classnameFor(member.QNameEnumRef)} ${member.simpleName}) {
-    set${member.simpleName.toString()?cap_first}(${classnameFor(member.QNameEnumRef)}.convertToKnownQName(${member.simpleName}));
+  public final void setKnown${member.simpleNameString?cap_first}(${classnameFor(member.QNameEnumRef)} ${member.simpleName}) {
+    set${member.simpleNameString?cap_first}(${classnameFor(member.QNameEnumRef)}.convertToKnownQName(${member.simpleName}));
   }
       [/#if]
     [/#if]
diff --git a/java-json-client/src/main/resources/com/webcohesion/enunciate/modules/java_json_client/client-complex-type.fmt b/java-json-client/src/main/resources/com/webcohesion/enunciate/modules/java_json_client/client-complex-type.fmt
index 34439950c..d5e4be109 100644
--- a/java-json-client/src/main/resources/com/webcohesion/enunciate/modules/java_json_client/client-complex-type.fmt
+++ b/java-json-client/src/main/resources/com/webcohesion/enunciate/modules/java_json_client/client-complex-type.fmt
@@ -73,7 +73,7 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * ${(type.value.javaDoc.return!type.value.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
   @JsonValue
-  public ${classnameFor(type.value)} get${type.value.simpleName.toString()?cap_first}() {
+  public ${classnameFor(type.value)} get${type.value.simpleNameString?cap_first}() {
     return this._${type.value.simpleName};
   }
 
@@ -81,7 +81,7 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * ${(type.value.javaDoc.return!type.value.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
   @JsonValue
-  public void set${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
+  public void set${type.value.simpleNameString?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
     this._${type.value.simpleName} = _${type.value.simpleName};
   }
       [#if type.value.referencesQNameEnum!false]
@@ -92,8 +92,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * @see ${classnameFor(type.value.QNameEnumRef)}#convertFromKnownQName
    */
   @JsonIgnore
-  public ${classnameFor(type.value.QNameEnumRef)} getKnown${type.value.simpleName.toString()?cap_first}() {
-    return ${classnameFor(type.value.QNameEnumRef)}.convertFromKnownQName(get${type.value.simpleName.toString()?cap_first}());
+  public ${classnameFor(type.value.QNameEnumRef)} getKnown${type.value.simpleNameString?cap_first}() {
+    return ${classnameFor(type.value.QNameEnumRef)}.convertFromKnownQName(get${type.value.simpleNameString?cap_first}());
   }
 
   /**
@@ -102,8 +102,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * @see ${classnameFor(type.value.QNameEnumRef)}#convertToKnownQName
    */
   @JsonIgnore
-  public void setKnown${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value.QNameEnumRef)} _${type.value.simpleName}) {
-    set${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value.QNameEnumRef)}.convertToKnownQName(_${type.value.simpleName})[#if type.value.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
+  public void setKnown${type.value.simpleNameString?cap_first}(${classnameFor(type.value.QNameEnumRef)} _${type.value.simpleName}) {
+    set${type.value.simpleNameString?cap_first}(${classnameFor(type.value.QNameEnumRef)}.convertToKnownQName(_${type.value.simpleName})[#if type.value.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
   }
       [/#if]
     [/#if]
@@ -129,7 +129,7 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
   @JsonFormat( pattern = "${formatInfo.pattern!""}"[#if formatInfo.shape??], shape = JsonFormat.Shape.${formatInfo.shape.name()}[/#if][#if formatInfo.timezone??], timezone = "${formatInfo.timezone}"[/#if][#if formatInfo.locale??], locale = "${formatInfo.locale}"[/#if] )
         [/#if]
   @JsonProperty( value = "${member.name}", required = ${member.required?c}[#if member.defaultValue??], defaultValue="${member.defaultValue}"[/#if] )
-  public ${classnameFor(member)} get${member.simpleName.toString()?cap_first}() {
+  public ${classnameFor(member)} get${member.simpleNameString?cap_first}() {
     return this._${member.simpleName};
   }
 
@@ -147,7 +147,7 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
   @JsonTypeInfo( include = JsonTypeInfo.As.${member.subtypeIdInclusion?string}, use = JsonTypeInfo.Id.NAME )
         [/#if]
   @JsonProperty( value = "${member.name}", required = ${member.required?c}[#if member.defaultValue??], defaultValue="${member.defaultValue}"[/#if] )
-  public void set${member.simpleName.toString()?cap_first}(${classnameFor(member)} _${member.simpleName}) {
+  public void set${member.simpleNameString?cap_first}(${classnameFor(member)} _${member.simpleName}) {
     this._${member.simpleName} = _${member.simpleName};
   }
         [#if member.referencesQNameEnum!false]
@@ -158,8 +158,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * @see ${classnameFor(member.QNameEnumRef)}#convertFromKnownQName
    */
   @JsonIgnore
-  public ${classnameFor(member.QNameEnumRef)} getKnown${member.simpleName.toString()?cap_first}() {
-    return ${classnameFor(member.QNameEnumRef)}.convertFromKnownQName(get${member.simpleName.toString()?cap_first}());
+  public ${classnameFor(member.QNameEnumRef)} getKnown${member.simpleNameString?cap_first}() {
+    return ${classnameFor(member.QNameEnumRef)}.convertFromKnownQName(get${member.simpleNameString?cap_first}());
   }
 
   /**
@@ -168,8 +168,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * @see ${classnameFor(member.QNameEnumRef)}#convertToKnownQName
    */
   @JsonIgnore
-  public void setKnown${member.simpleName.toString()?cap_first}(${classnameFor(member.QNameEnumRef)} _${member.simpleName}) {
-    set${member.simpleName.toString()?cap_first}(${classnameFor(member.QNameEnumRef)}.convertToKnownQName(_${member.simpleName})[#if member.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
+  public void setKnown${member.simpleNameString?cap_first}(${classnameFor(member.QNameEnumRef)} _${member.simpleName}) {
+    set${member.simpleNameString?cap_first}(${classnameFor(member.QNameEnumRef)}.convertToKnownQName(_${member.simpleName})[#if member.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
   }
         [/#if]
       [/#if]
diff --git a/java-json-client/src/main/resources/com/webcohesion/enunciate/modules/java_json_client/client-simple-type.fmt b/java-json-client/src/main/resources/com/webcohesion/enunciate/modules/java_json_client/client-simple-type.fmt
index 3452c0738..0c915c22d 100644
--- a/java-json-client/src/main/resources/com/webcohesion/enunciate/modules/java_json_client/client-simple-type.fmt
+++ b/java-json-client/src/main/resources/com/webcohesion/enunciate/modules/java_json_client/client-simple-type.fmt
@@ -49,7 +49,7 @@ public [#if type.final]final [/#if]class ${type.simpleName} implements java.io.S
    * ${(type.value.docComment!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
   @JsonValue
-  public ${classnameFor(type.value)} get${type.value.simpleName.toString()?cap_first}() {
+  public ${classnameFor(type.value)} get${type.value.simpleNameString?cap_first}() {
     return this._${type.value.simpleName};
   }
 
@@ -57,7 +57,7 @@ public [#if type.final]final [/#if]class ${type.simpleName} implements java.io.S
    * ${(type.value.docComment!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
   @JsonValue
-  public void set${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
+  public void set${type.value.simpleNameString?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
     this._${type.value.simpleName} = _${type.value.simpleName};
   }
 }
diff --git a/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-complex-type.fmt b/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-complex-type.fmt
index 0293c3cc6..da0c74349 100644
--- a/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-complex-type.fmt
+++ b/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-complex-type.fmt
@@ -70,14 +70,14 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * ${(attribute.javaDoc.return!attribute.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
   [@libJaxbMetadata.writeAccessorMetadata accessor=attribute /]
-  public ${classnameFor(attribute)} get${attribute.simpleName.toString()?cap_first}() {
+  public ${classnameFor(attribute)} get${attribute.simpleNameString?cap_first}() {
     return this._${attribute.simpleName};
   }
 
   /**
    * ${(attribute.javaDoc.return!attribute.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public void set${attribute.simpleName.toString()?cap_first}(${classnameFor(attribute)} _${attribute.simpleName}) {
+  public void set${attribute.simpleNameString?cap_first}(${classnameFor(attribute)} _${attribute.simpleName}) {
     this._${attribute.simpleName} = _${attribute.simpleName};
   }
       [#if attribute.referencesQNameEnum!false]
@@ -88,8 +88,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * @see ${classnameFor(attribute.QNameEnumRef)}#convertFromKnownQName
    */
   @javax.xml.bind.annotation.XmlTransient
-  public ${classnameFor(attribute.QNameEnumRef)} getKnown${attribute.simpleName.toString()?cap_first}() {
-    return ${classnameFor(attribute.QNameEnumRef)}.convertFromKnownQName(get${attribute.simpleName.toString()?cap_first}());
+  public ${classnameFor(attribute.QNameEnumRef)} getKnown${attribute.simpleNameString?cap_first}() {
+    return ${classnameFor(attribute.QNameEnumRef)}.convertFromKnownQName(get${attribute.simpleNameString?cap_first}());
   }
 
   /**
@@ -97,8 +97,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    *
    * @see ${classnameFor(attribute.QNameEnumRef)}#convertToKnownQName
    */
-  public void setKnown${attribute.simpleName.toString()?cap_first}(${classnameFor(attribute.QNameEnumRef)} _${attribute.simpleName}) {
-    set${attribute.simpleName.toString()?cap_first}(${classnameFor(attribute.QNameEnumRef)}.convertToKnownQName(_${attribute.simpleName})[#if attribute.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
+  public void setKnown${attribute.simpleNameString?cap_first}(${classnameFor(attribute.QNameEnumRef)} _${attribute.simpleName}) {
+    set${attribute.simpleNameString?cap_first}(${classnameFor(attribute.QNameEnumRef)}.convertToKnownQName(_${attribute.simpleName})[#if attribute.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
   }
       [/#if]
     [/#if]
@@ -110,14 +110,14 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * ${(type.value.javaDoc.return!type.value.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
   [@libJaxbMetadata.writeAccessorMetadata accessor=type.value /]
-  public ${classnameFor(type.value)} get${type.value.simpleName.toString()?cap_first}() {
+  public ${classnameFor(type.value)} get${type.value.simpleNameString?cap_first}() {
     return this._${type.value.simpleName};
   }
 
   /**
    * ${(type.value.javaDoc.return!type.value.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public void set${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
+  public void set${type.value.simpleNameString?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
     this._${type.value.simpleName} = _${type.value.simpleName};
   }
       [#if type.value.referencesQNameEnum!false]
@@ -128,8 +128,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * @see ${classnameFor(type.value.QNameEnumRef)}#convertFromKnownQName
    */
   @javax.xml.bind.annotation.XmlTransient
-  public ${classnameFor(type.value.QNameEnumRef)} getKnown${type.value.simpleName.toString()?cap_first}() {
-    return ${classnameFor(type.value.QNameEnumRef)}.convertFromKnownQName(get${type.value.simpleName.toString()?cap_first}());
+  public ${classnameFor(type.value.QNameEnumRef)} getKnown${type.value.simpleNameString?cap_first}() {
+    return ${classnameFor(type.value.QNameEnumRef)}.convertFromKnownQName(get${type.value.simpleNameString?cap_first}());
   }
 
   /**
@@ -137,8 +137,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    *
    * @see ${classnameFor(type.value.QNameEnumRef)}#convertToKnownQName
    */
-  public void setKnown${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value.QNameEnumRef)} _${type.value.simpleName}) {
-    set${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value.QNameEnumRef)}.convertToKnownQName(_${type.value.simpleName})[#if type.value.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
+  public void setKnown${type.value.simpleNameString?cap_first}(${classnameFor(type.value.QNameEnumRef)} _${type.value.simpleName}) {
+    set${type.value.simpleNameString?cap_first}(${classnameFor(type.value.QNameEnumRef)}.convertToKnownQName(_${type.value.simpleName})[#if type.value.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
   }
       [/#if]
     [/#if]
@@ -150,14 +150,14 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * ${(element.javaDoc.return!element.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
   [@libJaxbMetadata.writeAccessorMetadata accessor=element /]
-  public ${classnameFor(element)} get${element.simpleName.toString()?cap_first}() {
+  public ${classnameFor(element)} get${element.simpleNameString?cap_first}() {
     return this._${element.simpleName};
   }
 
   /**
    * ${(element.javaDoc.return!element.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public void set${element.simpleName.toString()?cap_first}(${classnameFor(element)} _${element.simpleName}) {
+  public void set${element.simpleNameString?cap_first}(${classnameFor(element)} _${element.simpleName}) {
     this._${element.simpleName} = _${element.simpleName};
   }
        [#if element.referencesQNameEnum!false]
@@ -168,8 +168,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * @see ${classnameFor(element.QNameEnumRef)}#convertFromKnownQName
    */
   @javax.xml.bind.annotation.XmlTransient
-  public ${classnameFor(element.QNameEnumRef)} getKnown${element.simpleName.toString()?cap_first}() {
-    return ${classnameFor(element.QNameEnumRef)}.convertFromKnownQName(get${element.simpleName.toString()?cap_first}());
+  public ${classnameFor(element.QNameEnumRef)} getKnown${element.simpleNameString?cap_first}() {
+    return ${classnameFor(element.QNameEnumRef)}.convertFromKnownQName(get${element.simpleNameString?cap_first}());
   }
 
   /**
@@ -177,8 +177,8 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    *
    * @see ${classnameFor(element.QNameEnumRef)}#convertToKnownQName
    */
-  public void setKnown${element.simpleName.toString()?cap_first}(${classnameFor(element.QNameEnumRef)} _${element.simpleName}) {
-    set${element.simpleName.toString()?cap_first}(${classnameFor(element.QNameEnumRef)}.convertToKnownQName(_${element.simpleName})[#if element.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
+  public void setKnown${element.simpleNameString?cap_first}(${classnameFor(element.QNameEnumRef)} _${element.simpleName}) {
+    set${element.simpleNameString?cap_first}(${classnameFor(element.QNameEnumRef)}.convertToKnownQName(_${element.simpleName})[#if element.resolvedAccessorType.isInstanceOf("java.lang.String")].toString()[/#if]);
   }
         [/#if]
       [/#if]
@@ -190,14 +190,14 @@ public [#if type.final]final [/#if]class ${simpleNameFor(type)} [#if !type.baseO
    * ${(type.anyElement.javaDoc.return!type.anyElement.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
   @javax.xml.bind.annotation.XmlAnyElement[#if type.anyElement.lax!false]( lax = true )[/#if]
-  public java.util.List<Object> get${type.anyElement.simpleName.toString()?cap_first}() {
+  public java.util.List<Object> get${type.anyElement.simpleNameString?cap_first}() {
     return this._${type.anyElement.simpleName};
   }
 
   /**
    * ${(type.anyElement.javaDoc.return!type.anyElement.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public void set${type.anyElement.simpleName.toString()?cap_first}(java.util.List<Object> _${type.anyElement.simpleName}) {
+  public void set${type.anyElement.simpleNameString?cap_first}(java.util.List<Object> _${type.anyElement.simpleName}) {
     this._${type.anyElement.simpleName} = _${type.anyElement.simpleName};
   }
   [/#if]
diff --git a/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-simple-type.fmt b/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-simple-type.fmt
index 17d5ff33d..c79621adc 100644
--- a/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-simple-type.fmt
+++ b/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-simple-type.fmt
@@ -50,14 +50,14 @@ public [#if type.final]final [/#if]class ${type.simpleName} implements java.io.S
    * ${(type.value.docComment!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
   [@libJaxbMetadata.writeAccessorMetadata accessor=type.value /]
-  public ${classnameFor(type.value)} get${type.value.simpleName.toString()?cap_first}() {
+  public ${classnameFor(type.value)} get${type.value.simpleNameString?cap_first}() {
     return this._${type.value.simpleName};
   }
 
   /**
    * ${(type.value.docComment!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public void set${type.value.simpleName.toString()?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
+  public void set${type.value.simpleNameString?cap_first}(${classnameFor(type.value)} _${type.value.simpleName}) {
     this._${type.value.simpleName} = _${type.value.simpleName};
   }
 
diff --git a/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-web-fault.fmt b/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-web-fault.fmt
index e061b7507..6fd7ff270 100644
--- a/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-web-fault.fmt
+++ b/java-xml-client/src/main/resources/com/webcohesion/enunciate/modules/java_xml_client/client-web-fault.fmt
@@ -91,7 +91,7 @@ public class ${fault.simpleName} extends Exception {
   protected void init(${beanfqn} faultInfo) {
     [#list fault.childElements as childElement]
       [#assign element=childElement.property/]
-    set${element.simpleName.toString()?cap_first}(faultInfo.get${element.simpleName.toString()?cap_first}());
+    set${element.simpleNameString?cap_first}(faultInfo.get${element.simpleNameString?cap_first}());
     [/#list]
   }
 
@@ -109,14 +109,14 @@ public class ${fault.simpleName} extends Exception {
   /**
    * ${(element.javaDoc.return!element.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public ${classnameFor(childElement)} get${element.simpleName.toString()?cap_first}() {
+  public ${classnameFor(childElement)} get${element.simpleNameString?cap_first}() {
     return this.${element.simpleName};
   }
 
   /**
    * ${(element.javaDoc.return!element.docValue!"(no documentation provided)")?chop_linebreak?replace("\n", "\n   * ")}
    */
-  public void set${element.simpleName.toString()?cap_first}(${classnameFor(childElement)} ${element.simpleName}) {
+  public void set${element.simpleNameString?cap_first}(${classnameFor(childElement)} ${element.simpleName}) {
     this.${element.simpleName} = ${element.simpleName};
   }
     [/#list]
diff --git a/javac-support/src/main/java/com/webcohesion/enunciate/javac/decorations/element/DecoratedElement.java b/javac-support/src/main/java/com/webcohesion/enunciate/javac/decorations/element/DecoratedElement.java
index 4e138392b..46984d874 100644
--- a/javac-support/src/main/java/com/webcohesion/enunciate/javac/decorations/element/DecoratedElement.java
+++ b/javac-support/src/main/java/com/webcohesion/enunciate/javac/decorations/element/DecoratedElement.java
@@ -307,6 +307,10 @@ public Set<Modifier> getModifiers() {
   public Name getSimpleName() {
     return this.delegate.getSimpleName();
   }
+  
+  public String getSimpleNameString() {
+    return getSimpleName().toString();
+  }
 
   public E getDelegate() {
     return this.delegate;