diff --git a/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala b/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala
index 7c0fb4425..6cb081cc2 100644
--- a/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala
+++ b/compiler-plugin/src/main/scala/com/trueaccord/scalapb/compiler/DescriptorPimps.scala
@@ -271,7 +271,7 @@ trait DescriptorPimps {
       }
 
     def fullJavaName(fullName: String) = {
-      javaFullOuterClassName + "." + stripPackageName(fullName)
+      javaFullOuterClassName + "." + stripPackageName(fullName).asSymbol
     }
 
     def fileDescriptorObjectName = snakeCaseToCamelCase(file.getName, upperInitial = true)
diff --git a/e2e/src/main/protobuf/names.dot.proto b/e2e/src/main/protobuf/names.dot.proto
index c8837474e..3a391b39b 100644
--- a/e2e/src/main/protobuf/names.dot.proto
+++ b/e2e/src/main/protobuf/names.dot.proto
@@ -30,3 +30,6 @@ message WeirdNamesRequired {
   required string tag = 2;
   required Option option = 3;
 }
+
+message yield {
+}