diff --git a/jdk/make/java/java/Makefile b/jdk/make/java/java/Makefile
index 8755a4c3a6e..b0e40530f4e 100644
--- a/jdk/make/java/java/Makefile
+++ b/jdk/make/java/java/Makefile
@@ -390,7 +390,7 @@ clean::
 LOCALES_GEN_SH = localelist.sh
 
 $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java: \
-	$(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java $(LOCALES_GEN_SH)
+	$(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java.template $(LOCALES_GEN_SH)
 	@$(prep-target) 
 	NAWK="$(NAWK)" SED="$(SED)" $(SH) $(LOCALES_GEN_SH) "$(JRE_NONEXIST_LOCALES)" \
 		$< $@ 
diff --git a/jdk/make/java/java/genlocales.gmk b/jdk/make/java/java/genlocales.gmk
index bda003b9ce1..3adb769490d 100644
--- a/jdk/make/java/java/genlocales.gmk
+++ b/jdk/make/java/java/genlocales.gmk
@@ -68,7 +68,7 @@ NonEuro_Resources_properties := $(FILES_compiled_properties)
 FILES_java := $(FILES_java_orig)
 FILES_compiled_properties := $(FILES_compiled_properties_orig)
 
-LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/LocaleDataMetaInfo-XLocales.java
+LocaleDataMetaInfo_Src=$(SHARE_SRC)/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
 LocaleDataMetaInfo_Dest=$(GENSRCDIR)/sun/util/LocaleDataMetaInfo.java
 LOCALEGEN_SH=localegen.sh
 RESOURCE_NAMES="FormatData CollationData TimeZoneNames LocaleNames CurrencyNames CalendarData"
diff --git a/jdk/make/java/java/localegen.sh b/jdk/make/java/java/localegen.sh
index 8f79eaebb88..a21c515dc1a 100644
--- a/jdk/make/java/java/localegen.sh
+++ b/jdk/make/java/java/localegen.sh
@@ -27,7 +27,7 @@
 
 #
 # This script is to generate the supported locale list string and replace the
-# LocaleDataMetaInfo-XLocales.java in <ws>/src/share/classes/sun/util
+# LocaleDataMetaInfo-XLocales.java.template in <ws>/src/share/classes/sun/util
 # 
 # SORT, NAWK & SED is passed in as environment variables.
 #
diff --git a/jdk/make/java/nio/Makefile b/jdk/make/java/nio/Makefile
index e0cb40839e8..455d7529f67 100644
--- a/jdk/make/java/nio/Makefile
+++ b/jdk/make/java/nio/Makefile
@@ -834,7 +834,7 @@ $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
 GENCSSRC = $(BUILDDIR)/tools/CharsetMapping
 CHARSETMAPPING_JARFILE = $(BUILDTOOLJARDIR)/charsetmapping.jar
 
-$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java $(GENCSSRC)/sbcs
+$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java.template $(GENCSSRC)/sbcs
 	@$(prep-target)
 	$(BOOT_JAVA_CMD) -jar $(CHARSETMAPPING_JARFILE) $(GENCSSRC) $(SCS_GEN) sbcs
 
diff --git a/jdk/make/netbeans/README b/jdk/make/netbeans/README
index 9c713190034..8f68dce0ee5 100644
--- a/jdk/make/netbeans/README
+++ b/jdk/make/netbeans/README
@@ -411,7 +411,7 @@ Creating your own NetBeans project
             java/util/regex/,\
             java/util/spi/,\
             java/util/zip/,\
-            **/*-XLocales.java
+            **/*-XLocales.java.template
         jtreg.tests=\
             java/util/**/*Collection/ \
             java/util/**/*Map/ \
diff --git a/jdk/make/sun/nio/Makefile b/jdk/make/sun/nio/Makefile
index e83c6f1f36d..4b46a1fb76d 100644
--- a/jdk/make/sun/nio/Makefile
+++ b/jdk/make/sun/nio/Makefile
@@ -82,7 +82,9 @@ $(FILES_DAT): $(FILES_MAP)
 		$(FILES_MAP) $(FILES_DAT) sjis0213
 
 
-$(FILES_genout_extcs): $(GENCSDATASRC)/SingleByte-X.java  $(GENCSDATASRC)/DoubleByte-X.java \
+$(FILES_genout_extcs): \
+                $(GENCSDATASRC)/SingleByte-X.java.template  \
+		$(GENCSDATASRC)/DoubleByte-X.java.template \
 		$(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs
 	@$(prep-target)
 	$(RM) -r $(GENCSEXT)
diff --git a/jdk/make/tools/CharsetMapping/DoubleByte-X.java b/jdk/make/tools/CharsetMapping/DoubleByte-X.java.template
similarity index 100%
rename from jdk/make/tools/CharsetMapping/DoubleByte-X.java
rename to jdk/make/tools/CharsetMapping/DoubleByte-X.java.template
diff --git a/jdk/make/tools/CharsetMapping/SingleByte-X.java b/jdk/make/tools/CharsetMapping/SingleByte-X.java.template
similarity index 100%
rename from jdk/make/tools/CharsetMapping/SingleByte-X.java
rename to jdk/make/tools/CharsetMapping/SingleByte-X.java.template
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java b/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
index f38e759c456..27dc8719b95 100644
--- a/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
+++ b/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
@@ -63,7 +63,7 @@ public class GenerateDBCS {
             int    b2Min    = toInteger(fields[8]);
             int    b2Max    = toInteger(fields[9]);
             System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName);
-            genClass(args[0], args[1], "DoubleByte-X.java",
+            genClass(args[0], args[1], "DoubleByte-X.java.template",
                     clzName, csName, hisName, pkgName,
                     isASCII, type,
                     b1Min, b1Max, b2Min, b2Max);
diff --git a/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java b/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
index 8a57a6521bc..cb6496e0a99 100644
--- a/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
+++ b/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
@@ -55,7 +55,7 @@ public class GenerateSBCS {
             String pkgName  = fields[4];
             System.out.printf("%s,%s,%s,%b,%s%n", clzName, csName, hisName, isASCII, pkgName);
 
-            genClass(args[0], args[1], "SingleByte-X.java",
+            genClass(args[0], args[1], "SingleByte-X.java.template",
                      clzName, csName, hisName, pkgName, isASCII);
         }
     }
diff --git a/jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java b/jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
similarity index 100%
rename from jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java
rename to jdk/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template
diff --git a/jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java b/jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
similarity index 100%
rename from jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java
rename to jdk/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template
diff --git a/jdk/test/java/util/Formatter/Basic-X.java b/jdk/test/java/util/Formatter/Basic-X.java.template
similarity index 100%
rename from jdk/test/java/util/Formatter/Basic-X.java
rename to jdk/test/java/util/Formatter/Basic-X.java.template
diff --git a/jdk/test/java/util/Formatter/genBasic.sh b/jdk/test/java/util/Formatter/genBasic.sh
index 2c352ad39cf..819afe7cd39 100644
--- a/jdk/test/java/util/Formatter/genBasic.sh
+++ b/jdk/test/java/util/Formatter/genBasic.sh
@@ -27,10 +27,10 @@ javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java
 
 gen() {
 #  if [ $3 = "true" ]
-#  then $SPP -K$1 -Dtype=$1 -DType=$2 -Kprim<Basic-X.java >Basic$2.java
-#  else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 <Basic-X.java >Basic$2.java
+#  then $SPP -K$1 -Dtype=$1 -DType=$2 -Kprim<Basic-X.java.template >Basic$2.java
+#  else $SPP -K$1 -Dtype=$1 -DType=$2 -K$3 <Basic-X.java.template >Basic$2.java
 #  fi
-    java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java >Basic$2.java
+    java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -K$3 -K$4 -K$5 -K$6 <Basic-X.java.template >Basic$2.java
 }
 
 gen boolean Boolean       prim  ""  ""   ""