diff --git a/java/build.xml b/java/build.xml
index 803226d85..81d8d6f1e 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -45,14 +45,14 @@
     </exec>
   </target>
 
-  <target name="build-phone-metadata-to-one-file">
+  <target name="build-single-file-phone-metadata">
     <exec executable="java">
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataProtoFromXml"/>
       <arg value="--input-file=${resources.dir}/PhoneNumberMetadata.xml"/>
       <arg value="--output-dir=${libphonenumber.src.dir}/com/google/i18n/phonenumbers"/>
-      <arg value="--data-prefix=data/PhoneNumberMetadataProtoFile"/>
+      <arg value="--data-prefix=data/SingleFilePhoneNumberMetadataProto"/>
       <arg value="--single-file=true"/>
       <arg value="--mapping-class=CountryCodeToRegionCodeMap"/>
       <arg value="--copyright=2010"/>
@@ -88,14 +88,14 @@
     </exec>
   </target>
 
-  <target name="build-test-metadata-to-one-file">
+  <target name="build-single-file-test-metadata">
     <exec executable="java">
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataProtoFromXml"/>
       <arg value="--input-file=${resources.dir}/PhoneNumberMetadataForTesting.xml"/>
       <arg value="--output-dir=${libphonenumber.test.dir}/com/google/i18n/phonenumbers"/>
-      <arg value="--data-prefix=data/PhoneNumberMetadataProtoForTestingFile"/>
+      <arg value="--data-prefix=data/SingleFilePhoneNumberMetadataProtoForTesting"/>
       <arg value="--single-file=true"/>
       <arg value="--mapping-class=CountryCodeToRegionCodeMapForTesting"/>
       <arg value="--copyright=2010"/>
diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
index 756de62b4..9992f6454 100644
--- a/java/libphonenumber/pom.xml
+++ b/java/libphonenumber/pom.xml
@@ -36,8 +36,8 @@
           <excludes>
             <exclude>**/SingleFileMetadataSourceImpl.class</exclude>
             <exclude>**/SingleFileMetadataSourceImpl.java</exclude>
-            <exclude>**/PhoneNumberMetadataProtoFile</exclude>
-            <exclude>**/PhoneNumberMetadataProtoForTestingFile</exclude>
+            <exclude>**/SingleFilePhoneNumberMetadataProto</exclude>
+            <exclude>**/SingleFilePhoneNumberMetadataProtoForTesting</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java
index 1b03fd485..289c708ae 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java
@@ -24,7 +24,7 @@ public final class SingleFileMetadataSourceImpl implements MetadataSource {
       Logger.getLogger(SingleFileMetadataSourceImpl.class.getName());
 
   private static final String META_DATA_FILE =
-      "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoFile";
+      "/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto";
 
   // A mapping from a region code to the PhoneMetadata for that region.
   // Note: Synchronization, though only needed for the Android version of the library, is used in
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoFile b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto
similarity index 100%
rename from java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoFile
rename to java/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto
diff --git a/java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTestingFile b/java/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting
similarity index 100%
rename from java/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTestingFile
rename to java/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting