### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: model/org/eclipse/jdt/internal/core/InternalNamingConventions.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/InternalNamingConventions.java,v
retrieving revision 1.13
diff -u -r1.13 InternalNamingConventions.java
--- model/org/eclipse/jdt/internal/core/InternalNamingConventions.java	8 Mar 2006 19:44:51 -0000	1.13
+++ model/org/eclipse/jdt/internal/core/InternalNamingConventions.java	28 Mar 2006 19:29:07 -0000
@@ -14,7 +14,6 @@
 
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaConventions;
 import org.eclipse.jdt.core.compiler.CharOperation;
 import org.eclipse.jdt.core.compiler.InvalidInputException;
 import org.eclipse.jdt.internal.codeassist.impl.AssistOptions;
@@ -199,25 +198,34 @@
 									prefixName,
 									suffixes[l],
 									excludedNames);
-							if(JavaConventions.validateFieldName(new String(suffixName)).isOK()) {
-								acceptName(suffixName, prefixes[k], suffixes[l],  k == 0, l == 0, internalPrefix.length - j, requestor);
-								acceptDefaultName = false;
-							} else {
-								suffixName = CharOperation.concat(
-									prefixName,
-									String.valueOf(1).toCharArray(),
-									suffixes[l]
-								);
-								suffixName =
-									excludeNames(
-										suffixName,
-										prefixName,
-										suffixes[l],
-										excludedNames);
-								if(JavaConventions.validateFieldName(new String(suffixName)).isOK()) {
-									acceptName(suffixName, prefixes[k], suffixes[l], k == 0, l == 0, internalPrefix.length - j, requestor);
-									acceptDefaultName = false;
+							try{
+								nameScanner.setSource(suffixName);
+								switch (nameScanner.getNextToken()) {
+									case TerminalTokens.TokenNameIdentifier :
+										acceptName(suffixName, prefixes[k], suffixes[l],  k == 0, l == 0, internalPrefix.length - j, requestor);
+										acceptDefaultName = false;
+										break;
+									default:
+										suffixName = CharOperation.concat(
+											prefixName,
+											String.valueOf(1).toCharArray(),
+											suffixes[l]
+										);
+										suffixName =
+											excludeNames(
+												suffixName,
+												prefixName,
+												suffixes[l],
+												excludedNames);
+										nameScanner.setSource(suffixName);
+										switch (nameScanner.getNextToken()) {
+											case TerminalTokens.TokenNameIdentifier :
+												acceptName(suffixName, prefixes[k], suffixes[l], k == 0, l == 0, internalPrefix.length - j, requestor);
+												acceptDefaultName = false;
+										}
 								}
+							} catch(InvalidInputException e){
+								// ignore
 							}
 						}
 					}