diff --git a/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
index 586ab47..8e1097a 100644
--- a/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
+++ b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
@@ -60,9 +60,9 @@
             // dependencies come before the descriptors depending on them.
             var descriptorData = new List<ByteString>
             {
-                UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(),
-                UnittestImportProto3Reflection.Descriptor.Proto.ToByteString(),
-                UnittestProto3Reflection.Descriptor.Proto.ToByteString()
+                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
+                UnittestImportProto3Reflection.Descriptor.SerializedData,
+                UnittestProto3Reflection.Descriptor.SerializedData
             };
             var converted = FileDescriptor.BuildFromByteStrings(descriptorData);
             Assert.AreEqual(3, converted.Count);
@@ -120,8 +120,8 @@
         {
             var descriptorData = new List<ByteString>
             {
-                UnittestImportProto3Reflection.Descriptor.Proto.ToByteString(),
-                UnittestProto3Reflection.Descriptor.Proto.ToByteString(),
+                UnittestImportProto3Reflection.Descriptor.SerializedData,
+                UnittestProto3Reflection.Descriptor.SerializedData,
             };
             // This will fail, because we're missing UnittestImportPublicProto3Reflection
             Assert.Throws<ArgumentException>(() => FileDescriptor.BuildFromByteStrings(descriptorData));
@@ -132,8 +132,8 @@
         {
             var descriptorData = new List<ByteString>
             {
-                UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(),
-                UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(),
+                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
+                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
             };
             // This will fail due to the same name being used twice
             Assert.Throws<ArgumentException>(() => FileDescriptor.BuildFromByteStrings(descriptorData));
@@ -144,9 +144,9 @@
         {
             var descriptorData = new List<ByteString>
             {
-                UnittestProto3Reflection.Descriptor.Proto.ToByteString(),
-                UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(),
-                UnittestImportProto3Reflection.Descriptor.Proto.ToByteString()
+                UnittestProto3Reflection.Descriptor.SerializedData,
+                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
+                UnittestImportProto3Reflection.Descriptor.SerializedData
             };
             // This will fail, because the dependencies should come first
             Assert.Throws<ArgumentException>(() => FileDescriptor.BuildFromByteStrings(descriptorData));
@@ -225,9 +225,9 @@
             // dependencies come before the descriptors depending on them.
             var descriptorData = new List<ByteString>
             {
-                UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(),
-                UnittestImportProto3Reflection.Descriptor.Proto.ToByteString(),
-                UnittestProto3Reflection.Descriptor.Proto.ToByteString()
+                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
+                UnittestImportProto3Reflection.Descriptor.SerializedData,
+                UnittestProto3Reflection.Descriptor.SerializedData
             };
             var converted = FileDescriptor.BuildFromByteStrings(descriptorData);
             TestFieldDescriptor(