diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/scoping/GlobalsTest_fileOptions_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/scoping/Globals_fileOptions_Test.java
similarity index 97%
rename from com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/scoping/GlobalsTest_fileOptions_Test.java
rename to com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/scoping/Globals_fileOptions_Test.java
index ec8acab..dfb7cef 100644
--- a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/scoping/GlobalsTest_fileOptions_Test.java
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/scoping/Globals_fileOptions_Test.java
@@ -24,7 +24,7 @@
  *
  * @author alruiz@google.com (Alex Ruiz)
  */
-public class GlobalsTest_fileOptions_Test {
+public class Globals_fileOptions_Test {
 
   @Rule public XtextRule xtext = new XtextRule();