diff --git a/conformance/conformance_objc.m b/conformance/conformance_objc.m
index ba1c946f33..a5012ec4f1 100644
--- a/conformance/conformance_objc.m
+++ b/conformance/conformance_objc.m
@@ -63,7 +63,7 @@ static NSData *CheckedReadDataOfLength(NSFileHandle *handle, NSUInteger numBytes
 
 static ConformanceResponse *DoTest(ConformanceRequest *request) {
   ConformanceResponse *response = [ConformanceResponse message];
-  TestAllTypesProto3 *testMessage = nil;
+  Proto3TestAllTypesProto3 *testMessage = nil;
 
   switch (request.payloadOneOfCase) {
     case ConformanceRequest_Payload_OneOfCase_GPBUnsetOneOfCase:
@@ -73,8 +73,8 @@ static ConformanceResponse *DoTest(ConformanceRequest *request) {
     case ConformanceRequest_Payload_OneOfCase_ProtobufPayload: {
       if ([request.messageType isEqualToString:@"protobuf_test_messages.proto3.TestAllTypesProto3"]) {
         NSError *error = nil;
-        testMessage = [TestAllTypesProto3 parseFromData:request.protobufPayload
-                                            error:&error];
+        testMessage = [Proto3TestAllTypesProto3 parseFromData:request.protobufPayload
+                                                        error:&error];
         if (!testMessage) {
           response.parseError =
               [NSString stringWithFormat:@"Parse error: %@", error];
diff --git a/src/google/protobuf/test_messages_proto3.proto b/src/google/protobuf/test_messages_proto3.proto
index abf7342772..84b9da9922 100644
--- a/src/google/protobuf/test_messages_proto3.proto
+++ b/src/google/protobuf/test_messages_proto3.proto
@@ -39,6 +39,7 @@ syntax = "proto3";
 
 package protobuf_test_messages.proto3;
 option java_package = "com.google.protobuf_test_messages.proto3";
+option objc_class_prefix = "Proto3";
 
 // This is the default, but we specify it here explicitly.
 option optimize_for = SPEED;