Abandon the 'self' namespace alias - we need to be able to import types in other namespaces too.

10 files changed, 2430 insertions, 2450 deletions

diff --git a/csharp/ProtocolBuffers.Test/TestProtos/EnumWithNoOuter.cs b/csharp/ProtocolBuffers.Test/TestProtos/EnumWithNoOuter.cs
index f85d31fe..868279e6 100644
--- a/csharp/ProtocolBuffers.Test/TestProtos/EnumWithNoOuter.cs
+++ b/csharp/ProtocolBuffers.Test/TestProtos/EnumWithNoOuter.cs
@@ -4,8 +4,6 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.TestProtos;
-
 namespace Google.ProtocolBuffers.TestProtos {
   
   public enum EnumWithNoOuter {
diff --git a/csharp/ProtocolBuffers.Test/TestProtos/MessageWithNoOuter.cs b/csharp/ProtocolBuffers.Test/TestProtos/MessageWithNoOuter.cs
index 6c5ec24f..dc318ce3 100644
--- a/csharp/ProtocolBuffers.Test/TestProtos/MessageWithNoOuter.cs
+++ b/csharp/ProtocolBuffers.Test/TestProtos/MessageWithNoOuter.cs
@@ -4,8 +4,6 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.TestProtos;
-
 namespace Google.ProtocolBuffers.TestProtos {
   
   public sealed partial class MessageWithNoOuter : pb::GeneratedMessage<MessageWithNoOuter, MessageWithNoOuter.Builder> {
@@ -19,11 +17,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::MultiFileProto.internal__static_protobuf_unittest_MessageWithNoOuter__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.MultiFileProto.internal__static_protobuf_unittest_MessageWithNoOuter__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::MultiFileProto.internal__static_protobuf_unittest_MessageWithNoOuter__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.MultiFileProto.internal__static_protobuf_unittest_MessageWithNoOuter__FieldAccessorTable; }
     }
     
     #region Nested types
@@ -43,11 +41,11 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         
         public static pbd::MessageDescriptor Descriptor {
-          get { return self::MultiFileProto.internal__static_protobuf_unittest_MessageWithNoOuter_NestedMessage__Descriptor; }
+          get { return global::Google.ProtocolBuffers.TestProtos.MultiFileProto.internal__static_protobuf_unittest_MessageWithNoOuter_NestedMessage__Descriptor; }
         }
         
         protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-          get { return self::MultiFileProto.internal__static_protobuf_unittest_MessageWithNoOuter_NestedMessage__FieldAccessorTable; }
+          get { return global::Google.ProtocolBuffers.TestProtos.MultiFileProto.internal__static_protobuf_unittest_MessageWithNoOuter_NestedMessage__FieldAccessorTable; }
         }
         
         // optional int32 i = 1;
@@ -60,35 +58,35 @@ namespace Google.ProtocolBuffers.TestProtos {
           get { return i_; }
         }
         
-        public static self::MessageWithNoOuter.Types.NestedMessage ParseFrom(pb::ByteString data) {
+        public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage ParseFrom(pb::ByteString data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::MessageWithNoOuter.Types.NestedMessage ParseFrom(pb::ByteString data,
+        public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage ParseFrom(pb::ByteString data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::MessageWithNoOuter.Types.NestedMessage ParseFrom(byte[] data) {
+        public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage ParseFrom(byte[] data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::MessageWithNoOuter.Types.NestedMessage ParseFrom(byte[] data,
+        public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage ParseFrom(byte[] data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::MessageWithNoOuter.Types.NestedMessage ParseFrom(global::System.IO.Stream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage ParseFrom(global::System.IO.Stream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::MessageWithNoOuter.Types.NestedMessage ParseFrom(
+        public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage ParseFrom(
             global::System.IO.Stream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::MessageWithNoOuter.Types.NestedMessage ParseFrom(pb::CodedInputStream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage ParseFrom(pb::CodedInputStream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::MessageWithNoOuter.Types.NestedMessage ParseFrom(pb::CodedInputStream input,
+        public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage ParseFrom(pb::CodedInputStream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
@@ -96,26 +94,26 @@ namespace Google.ProtocolBuffers.TestProtos {
         
         public static Builder CreateBuilder() { return new Builder(); }
         public override Builder CreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder(self::MessageWithNoOuter.Types.NestedMessage prototype) {
+        public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage prototype) {
           return (Builder) new Builder().MergeFrom(prototype);
         }
         
-        public sealed partial class Builder : pb::GeneratedBuilder<self::MessageWithNoOuter.Types.NestedMessage, Builder> {
+        public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage, Builder> {
           protected override Builder ThisBuilder {
             get { return this; }
           }
           
-          // Construct using self::MessageWithNoOuter.Types.NestedMessage.CreateBuilder()
+          // Construct using global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage.CreateBuilder()
           internal Builder() {}
           
-          self::MessageWithNoOuter.Types.NestedMessage result = new self::MessageWithNoOuter.Types.NestedMessage();
+          global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage result = new global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage();
           
-          protected override self::MessageWithNoOuter.Types.NestedMessage MessageBeingBuilt {
+          protected override global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage MessageBeingBuilt {
             get { return result; }
           }
           
           public override Builder Clear() {
-            result = new self::MessageWithNoOuter.Types.NestedMessage();
+            result = new global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage();
             return this;
           }
           
@@ -124,15 +122,15 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return self::MessageWithNoOuter.Types.NestedMessage.Descriptor; }
+            get { return global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage.Descriptor; }
           }
           
-          public override self::MessageWithNoOuter.Types.NestedMessage DefaultInstanceForType {
-            get { return self::MessageWithNoOuter.Types.NestedMessage.DefaultInstance; }
+          public override global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage DefaultInstanceForType {
+            get { return global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage.DefaultInstance; }
           }
           
-          public override self::MessageWithNoOuter.Types.NestedMessage BuildPartial() {
-            self::MessageWithNoOuter.Types.NestedMessage returnMe = result;
+          public override global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage BuildPartial() {
+            global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage returnMe = result;
             result = null;
             return returnMe;
           }
@@ -164,71 +162,71 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     // optional .protobuf_unittest.MessageWithNoOuter.NestedMessage nested = 1;
     private bool hasNested;
-    private self::MessageWithNoOuter.Types.NestedMessage nested_ = self::MessageWithNoOuter.Types.NestedMessage.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage nested_ = global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage.DefaultInstance;
     public bool HasNested {
       get { return hasNested; }
     }
-    public self::MessageWithNoOuter.Types.NestedMessage Nested {
+    public global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage Nested {
       get { return nested_; }
     }
     
     // repeated .protobuf_unittest.TestAllTypes foreign = 2;
-    private scg::IList<self::TestAllTypes> foreign_ = pbc::Lists<self::TestAllTypes>.Empty;
-    public scg::IList<self::TestAllTypes> ForeignList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes> foreign_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes> ForeignList {
       get { return foreign_; } 
     }
     public int ForeignCount
       { get { return foreign_.Count; }
     }
-    public self::TestAllTypes GetForeign(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.TestAllTypes GetForeign(int index) {
       return foreign_ [index];
     }
     
     // optional .protobuf_unittest.MessageWithNoOuter.NestedEnum nested_enum = 3;
     private bool hasNestedEnum;
-    private self::MessageWithNoOuter.Types.NestedEnum nestedEnum_ = self::MessageWithNoOuter.Types.NestedEnum.BAZ;
+    private global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedEnum nestedEnum_ = global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedEnum.BAZ;
     public bool HasNestedEnum {
       get { return hasNestedEnum; }
     }
-    public self::MessageWithNoOuter.Types.NestedEnum NestedEnum {  get { return nestedEnum_; }}
+    public global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedEnum NestedEnum {  get { return nestedEnum_; }}
     
     // optional .protobuf_unittest.EnumWithNoOuter foreign_enum = 4;
     private bool hasForeignEnum;
-    private self::EnumWithNoOuter foreignEnum_ = self::EnumWithNoOuter.FOO;
+    private global::Google.ProtocolBuffers.TestProtos.EnumWithNoOuter foreignEnum_ = global::Google.ProtocolBuffers.TestProtos.EnumWithNoOuter.FOO;
     public bool HasForeignEnum {
       get { return hasForeignEnum; }
     }
-    public self::EnumWithNoOuter ForeignEnum {  get { return foreignEnum_; }}
+    public global::Google.ProtocolBuffers.TestProtos.EnumWithNoOuter ForeignEnum {  get { return foreignEnum_; }}
     
-    public static self::MessageWithNoOuter ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::MessageWithNoOuter ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MessageWithNoOuter ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::MessageWithNoOuter ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MessageWithNoOuter ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::MessageWithNoOuter ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MessageWithNoOuter ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::MessageWithNoOuter ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -236,26 +234,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::MessageWithNoOuter prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::MessageWithNoOuter, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::MessageWithNoOuter.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.CreateBuilder()
       internal Builder() {}
       
-      self::MessageWithNoOuter result = new self::MessageWithNoOuter();
+      global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter result = new global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter();
       
-      protected override self::MessageWithNoOuter MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::MessageWithNoOuter();
+        result = new global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter();
         return this;
       }
       
@@ -264,18 +262,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::MessageWithNoOuter.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Descriptor; }
       }
       
-      public override self::MessageWithNoOuter DefaultInstanceForType {
-        get { return self::MessageWithNoOuter.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.DefaultInstance; }
       }
       
-      public override self::MessageWithNoOuter BuildPartial() {
-        if (result.foreign_ != pbc::Lists<self::TestAllTypes>.Empty) {
-          result.foreign_ = pbc::Lists<self::TestAllTypes>.AsReadOnly(result.foreign_);
+      public override global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter BuildPartial() {
+        if (result.foreign_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>.Empty) {
+          result.foreign_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>.AsReadOnly(result.foreign_);
         }
-        self::MessageWithNoOuter returnMe = result;
+        global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter returnMe = result;
         result = null;
         return returnMe;
       }
@@ -285,25 +283,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasNested {
         get { return result.HasNested; }
       }
-      public self::MessageWithNoOuter.Types.NestedMessage Nested {
+      public global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage Nested {
         get { return result.Nested; }
         set { SetNested(value); }
       }
-      public Builder SetNested(self::MessageWithNoOuter.Types.NestedMessage value) {
+      public Builder SetNested(global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage value) {
         result.hasNested = true;
         result.nested_ = value;
         return this;
       }
-      public Builder SetNested(self::MessageWithNoOuter.Types.NestedMessage.Builder builderForValue) {
+      public Builder SetNested(global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage.Builder builderForValue) {
         result.hasNested = true;
         result.nested_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeNested(self::MessageWithNoOuter.Types.NestedMessage value) {
+      public Builder MergeNested(global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage value) {
         if (result.HasNested &&
-            result.nested_ != self::MessageWithNoOuter.Types.NestedMessage.DefaultInstance) {
+            result.nested_ != global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage.DefaultInstance) {
           result.nested_ =
-            self::MessageWithNoOuter.Types.NestedMessage.CreateBuilder(result.nested_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage.CreateBuilder(result.nested_).MergeFrom(value).BuildPartial();
         } else {
           result.nested_ = value;
         }
@@ -312,51 +310,51 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearNested() {
         result.hasNested = false;
-        result.nested_ = self::MessageWithNoOuter.Types.NestedMessage.DefaultInstance;
+        result.nested_ = global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage.DefaultInstance;
         return this;
       }
       
       // repeated .protobuf_unittest.TestAllTypes foreign = 2;
-      public scg::IList<self::TestAllTypes> ForeignList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes> ForeignList {
         get { return pbc::Lists.AsReadOnly(result.foreign_); }
       }
       public int ForeignCount {
         get { return result.ForeignCount; }
       }
-      public self::TestAllTypes GetForeign(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.TestAllTypes GetForeign(int index) {
         return result.GetForeign(index);
       }
-      public Builder SetForeign(int index, self::TestAllTypes value) {
+      public Builder SetForeign(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) {
         result.foreign_[index] = value;
         return this;
       }
-      public Builder SetForeign(int index, self::TestAllTypes.Builder builderForValue) {
+      public Builder SetForeign(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder builderForValue) {
         result.foreign_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddForeign(self::TestAllTypes value) {
-        if (result.foreign_ == pbc::Lists<self::TestAllTypes>.Empty) {
-          result.foreign_ = new scg::List<self::TestAllTypes>();
+      public Builder AddForeign(global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) {
+        if (result.foreign_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>.Empty) {
+          result.foreign_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>();
         }
         result.foreign_.Add(value);
         return this;
       }
-      public Builder AddForeign(self::TestAllTypes.Builder builderForValue) {
-        if (result.foreign_ == pbc::Lists<self::TestAllTypes>.Empty) {
-          result.foreign_ = new scg::List<self::TestAllTypes>();
+      public Builder AddForeign(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder builderForValue) {
+        if (result.foreign_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>.Empty) {
+          result.foreign_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>();
         }
         result.foreign_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeForeign(scg::IEnumerable<self::TestAllTypes> values) {
-        if (result.foreign_ == pbc::Lists<self::TestAllTypes>.Empty) {
-          result.foreign_ = new scg::List<self::TestAllTypes>();
+      public Builder AddRangeForeign(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.TestAllTypes> values) {
+        if (result.foreign_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>.Empty) {
+          result.foreign_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>();
         }
         base.AddRange(values, result.foreign_);
         return this;
       }
       public Builder ClearForeign() {
-        result.foreign_ = pbc::Lists<self::TestAllTypes>.Empty;
+        result.foreign_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>.Empty;
         return this;
       }
       
@@ -364,18 +362,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasNestedEnum {
         get { return result.HasNestedEnum; }
       }
-      public self::MessageWithNoOuter.Types.NestedEnum NestedEnum {
+      public global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedEnum NestedEnum {
         get { return result.NestedEnum; }
         set { SetNestedEnum(value); }
       }
-      public Builder SetNestedEnum(self::MessageWithNoOuter.Types.NestedEnum value) {
+      public Builder SetNestedEnum(global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedEnum value) {
         result.hasNestedEnum = true;
         result.nestedEnum_ = value;
         return this;
       }
       public Builder ClearNestedEnum() {
         result.hasNestedEnum = false;
-        result.nestedEnum_ = self::MessageWithNoOuter.Types.NestedEnum.BAZ;
+        result.nestedEnum_ = global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedEnum.BAZ;
         return this;
       }
       
@@ -383,18 +381,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasForeignEnum {
         get { return result.HasForeignEnum; }
       }
-      public self::EnumWithNoOuter ForeignEnum {
+      public global::Google.ProtocolBuffers.TestProtos.EnumWithNoOuter ForeignEnum {
         get { return result.ForeignEnum; }
         set { SetForeignEnum(value); }
       }
-      public Builder SetForeignEnum(self::EnumWithNoOuter value) {
+      public Builder SetForeignEnum(global::Google.ProtocolBuffers.TestProtos.EnumWithNoOuter value) {
         result.hasForeignEnum = true;
         result.foreignEnum_ = value;
         return this;
       }
       public Builder ClearForeignEnum() {
         result.hasForeignEnum = false;
-        result.foreignEnum_ = self::EnumWithNoOuter.FOO;
+        result.foreignEnum_ = global::Google.ProtocolBuffers.TestProtos.EnumWithNoOuter.FOO;
         return this;
       }
     }
diff --git a/csharp/ProtocolBuffers.Test/TestProtos/MultiFileProto.cs b/csharp/ProtocolBuffers.Test/TestProtos/MultiFileProto.cs
index a96aae0d..83bd5e51 100644
--- a/csharp/ProtocolBuffers.Test/TestProtos/MultiFileProto.cs
+++ b/csharp/ProtocolBuffers.Test/TestProtos/MultiFileProto.cs
@@ -4,8 +4,6 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.TestProtos;
-
 namespace Google.ProtocolBuffers.TestProtos {
   
   public static partial class MultiFileProto {
@@ -54,7 +52,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             0x50, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0xca, 0x3e, 0x0e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x72, 
             0x6f, 0x74, 0x6f, 0xd0, 0x3e, 0x01, 0xd8, 0x3e, 0x00, 0xe0, 0x3e, 0x01, 
         }, new pbd::FileDescriptor[] {
-                self::UnitTestProtoFile.Descriptor,
+                global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor,
         });
     #endregion
     
@@ -69,15 +67,15 @@ namespace Google.ProtocolBuffers.TestProtos {
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_MessageWithNoOuter__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_MessageWithNoOuter__Descriptor,
             new string[] { "Nested", "Foreign", "NestedEnum", "ForeignEnum", },
-            typeof (self::MessageWithNoOuter),
-            typeof (self::MessageWithNoOuter.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter),
+            typeof (global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Builder));
     internal static readonly pbd::MessageDescriptor  internal__static_protobuf_unittest_MessageWithNoOuter_NestedMessage__Descriptor 
         = internal__static_protobuf_unittest_MessageWithNoOuter__Descriptor.NestedTypes[0];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_MessageWithNoOuter_NestedMessage__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_MessageWithNoOuter_NestedMessage__Descriptor,
             new string[] { "I", },
-            typeof (self::MessageWithNoOuter.Types.NestedMessage),
-            typeof (self::MessageWithNoOuter.Types.NestedMessage.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage),
+            typeof (global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.Types.NestedMessage.Builder));
     #endregion
     
   }
diff --git a/csharp/ProtocolBuffers.Test/TestProtos/ServiceWithNoOuter.cs b/csharp/ProtocolBuffers.Test/TestProtos/ServiceWithNoOuter.cs
index 8b5d97ee..887ac10e 100644
--- a/csharp/ProtocolBuffers.Test/TestProtos/ServiceWithNoOuter.cs
+++ b/csharp/ProtocolBuffers.Test/TestProtos/ServiceWithNoOuter.cs
@@ -4,18 +4,16 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.TestProtos;
-
 namespace Google.ProtocolBuffers.TestProtos {
   
   public abstract class ServiceWithNoOuter : pb::IService {
     public abstract void Foo(
         pb::IRpcController controller,
-        self::MessageWithNoOuter request,
-        global::System.Action<self::TestAllTypes> done);
+        global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter request,
+        global::System.Action<global::Google.ProtocolBuffers.TestProtos.TestAllTypes> done);
     
     public static pbd::ServiceDescriptor Descriptor {
-      get { return self::MultiFileProto.Descriptor.Services[0]; }
+      get { return global::Google.ProtocolBuffers.TestProtos.MultiFileProto.Descriptor.Services[0]; }
     }
     public pbd::ServiceDescriptor DescriptorForType {
       get { return Descriptor; }
@@ -33,8 +31,8 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       switch(method.Index) {
         case 0:
-          this.Foo(controller, (self::MessageWithNoOuter)request,
-            pb::RpcUtil.SpecializeCallback<self::TestAllTypes>(
+          this.Foo(controller, (global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter)request,
+            pb::RpcUtil.SpecializeCallback<global::Google.ProtocolBuffers.TestProtos.TestAllTypes>(
               done));
           return;
         default:
@@ -50,7 +48,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       switch(method.Index) {
         case 0:
-          return self::MessageWithNoOuter.DefaultInstance;
+          return global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter.DefaultInstance;
         default:
           throw new global::System.ArgumentException("Can't get here.");
       }
@@ -64,7 +62,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       switch(method.Index) {
         case 0:
-          return self::TestAllTypes.DefaultInstance;
+          return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance;
         default:
           throw new global::System.ArgumentException("Can't get here.");
       }
@@ -75,7 +73,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       return new Stub(channel);
     }
     
-    public class Stub : self::ServiceWithNoOuter {
+    public class Stub : global::Google.ProtocolBuffers.TestProtos.ServiceWithNoOuter {
       internal Stub(pb::IRpcChannel channel) {
         this.channel = channel;
       }
@@ -88,14 +86,14 @@ namespace Google.ProtocolBuffers.TestProtos {
       
       public override void Foo(
           pb::IRpcController controller,
-          self::MessageWithNoOuter request,
-          global::System.Action<self::TestAllTypes> done) {
+          global::Google.ProtocolBuffers.TestProtos.MessageWithNoOuter request,
+          global::System.Action<global::Google.ProtocolBuffers.TestProtos.TestAllTypes> done) {
         channel.CallMethod(
           Descriptor.Methods[0],
           controller,
           request,
-          self::TestAllTypes.DefaultInstance,
-          pb::RpcUtil.GeneralizeCallback<self::TestAllTypes, self::TestAllTypes.Builder>(done, self::TestAllTypes.DefaultInstance));
+          global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance,
+          pb::RpcUtil.GeneralizeCallback<global::Google.ProtocolBuffers.TestProtos.TestAllTypes, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder>(done, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance));
       }
     }
   }
diff --git a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
index d9459e29..e35f9b1d 100644
--- a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
+++ b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs
@@ -4,8 +4,6 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.TestProtos;
-
 namespace Google.ProtocolBuffers.TestProtos {
   
   public static partial class UnitTestEmbedOptimizeForProtoFile {
@@ -35,7 +33,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             0x3e, 0x21, 0x55, 0x6e, 0x69, 0x74, 0x54, 0x65, 0x73, 0x74, 0x45, 0x6d, 0x62, 0x65, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6d, 
             0x69, 0x7a, 0x65, 0x46, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, 0x6c, 0x65, 
         }, new pbd::FileDescriptor[] {
-                self::UnitTestOptimizeForProtoFile.Descriptor,
+                global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.Descriptor,
         });
     #endregion
     
@@ -48,8 +46,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestEmbedOptimizedForSize__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestEmbedOptimizedForSize__Descriptor,
             new string[] { "OptionalMessage", "RepeatedMessage", },
-            typeof (self::TestEmbedOptimizedForSize),
-            typeof (self::TestEmbedOptimizedForSize.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize.Builder));
     #endregion
     
   }
@@ -69,32 +67,32 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestEmbedOptimizeForProtoFile.internal__static_protobuf_unittest_TestEmbedOptimizedForSize__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestEmbedOptimizeForProtoFile.internal__static_protobuf_unittest_TestEmbedOptimizedForSize__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestEmbedOptimizeForProtoFile.internal__static_protobuf_unittest_TestEmbedOptimizedForSize__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestEmbedOptimizeForProtoFile.internal__static_protobuf_unittest_TestEmbedOptimizedForSize__FieldAccessorTable; }
     }
     
     // optional .protobuf_unittest.TestOptimizedForSize optional_message = 1;
     private bool hasOptionalMessage;
-    private self::TestOptimizedForSize optionalMessage_ = self::TestOptimizedForSize.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize optionalMessage_ = global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.DefaultInstance;
     public bool HasOptionalMessage {
       get { return hasOptionalMessage; }
     }
-    public self::TestOptimizedForSize OptionalMessage {
+    public global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize OptionalMessage {
       get { return optionalMessage_; }
     }
     
     // repeated .protobuf_unittest.TestOptimizedForSize repeated_message = 2;
-    private scg::IList<self::TestOptimizedForSize> repeatedMessage_ = pbc::Lists<self::TestOptimizedForSize>.Empty;
-    public scg::IList<self::TestOptimizedForSize> RepeatedMessageList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize> repeatedMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize> RepeatedMessageList {
       get { return repeatedMessage_; } 
     }
     public int RepeatedMessageCount
       { get { return repeatedMessage_.Count; }
     }
-    public self::TestOptimizedForSize GetRepeatedMessage(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize GetRepeatedMessage(int index) {
       return repeatedMessage_ [index];
     }
     
@@ -103,7 +101,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         if (HasOptionalMessage) {
           if (!OptionalMessage.IsInitialized) return false;
         }
-        foreach (self::TestOptimizedForSize element in RepeatedMessageList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize element in RepeatedMessageList) {
           if (!element.IsInitialized) return false;
         }
         return true;
@@ -114,7 +112,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       if (HasOptionalMessage) {
         output.WriteMessage(1, OptionalMessage);
       }
-      foreach (self::TestOptimizedForSize element in RepeatedMessageList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize element in RepeatedMessageList) {
         output.WriteMessage(2, element);
       }
       UnknownFields.WriteTo(output);
@@ -130,7 +128,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         if (HasOptionalMessage) {
           size += pb::CodedOutputStream.ComputeMessageSize(1, OptionalMessage);
         }
-        foreach (self::TestOptimizedForSize element in RepeatedMessageList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize element in RepeatedMessageList) {
           size += pb::CodedOutputStream.ComputeMessageSize(2, element);
         }
         size += UnknownFields.SerializedSize;
@@ -139,35 +137,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestEmbedOptimizedForSize ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestEmbedOptimizedForSize ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestEmbedOptimizedForSize ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestEmbedOptimizedForSize ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestEmbedOptimizedForSize ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestEmbedOptimizedForSize ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestEmbedOptimizedForSize ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestEmbedOptimizedForSize ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -175,26 +173,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestEmbedOptimizedForSize prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestEmbedOptimizedForSize, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestEmbedOptimizedForSize.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize.CreateBuilder()
       internal Builder() {}
       
-      self::TestEmbedOptimizedForSize result = new self::TestEmbedOptimizedForSize();
+      global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize result = new global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize();
       
-      protected override self::TestEmbedOptimizedForSize MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestEmbedOptimizedForSize();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize();
         return this;
       }
       
@@ -203,39 +201,39 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestEmbedOptimizedForSize.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize.Descriptor; }
       }
       
-      public override self::TestEmbedOptimizedForSize DefaultInstanceForType {
-        get { return self::TestEmbedOptimizedForSize.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize.DefaultInstance; }
       }
       
-      public override self::TestEmbedOptimizedForSize BuildPartial() {
-        if (result.repeatedMessage_ != pbc::Lists<self::TestOptimizedForSize>.Empty) {
-          result.repeatedMessage_ = pbc::Lists<self::TestOptimizedForSize>.AsReadOnly(result.repeatedMessage_);
+      public override global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize BuildPartial() {
+        if (result.repeatedMessage_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>.Empty) {
+          result.repeatedMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>.AsReadOnly(result.repeatedMessage_);
         }
-        self::TestEmbedOptimizedForSize returnMe = result;
+        global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestEmbedOptimizedForSize) {
-          return MergeFrom((self::TestEmbedOptimizedForSize) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestEmbedOptimizedForSize other) {
-        if (other == self::TestEmbedOptimizedForSize.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestEmbedOptimizedForSize.DefaultInstance) return this;
         if (other.HasOptionalMessage) {
           MergeOptionalMessage(other.OptionalMessage);
         }
         if (other.repeatedMessage_.Count != 0) {
           if (result.repeatedMessage_.Count == 0) {
-            result.repeatedMessage_ = new scg::List<self::TestOptimizedForSize>();
+            result.repeatedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>();
           }
           base.AddRange(other.repeatedMessage_, result.repeatedMessage_);
         }
@@ -265,7 +263,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 10: {
-              self::TestOptimizedForSize.Builder subBuilder = self::TestOptimizedForSize.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.CreateBuilder();
               if (HasOptionalMessage) {
                 subBuilder.MergeFrom(OptionalMessage);
               }
@@ -274,7 +272,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 18: {
-              self::TestOptimizedForSize.Builder subBuilder = self::TestOptimizedForSize.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddRepeatedMessage(subBuilder.BuildPartial());
               break;
@@ -288,25 +286,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalMessage {
         get { return result.HasOptionalMessage; }
       }
-      public self::TestOptimizedForSize OptionalMessage {
+      public global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize OptionalMessage {
         get { return result.OptionalMessage; }
         set { SetOptionalMessage(value); }
       }
-      public Builder SetOptionalMessage(self::TestOptimizedForSize value) {
+      public Builder SetOptionalMessage(global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize value) {
         result.hasOptionalMessage = true;
         result.optionalMessage_ = value;
         return this;
       }
-      public Builder SetOptionalMessage(self::TestOptimizedForSize.Builder builderForValue) {
+      public Builder SetOptionalMessage(global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.Builder builderForValue) {
         result.hasOptionalMessage = true;
         result.optionalMessage_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptionalMessage(self::TestOptimizedForSize value) {
+      public Builder MergeOptionalMessage(global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize value) {
         if (result.HasOptionalMessage &&
-            result.optionalMessage_ != self::TestOptimizedForSize.DefaultInstance) {
+            result.optionalMessage_ != global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.DefaultInstance) {
           result.optionalMessage_ =
-            self::TestOptimizedForSize.CreateBuilder(result.optionalMessage_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.CreateBuilder(result.optionalMessage_).MergeFrom(value).BuildPartial();
         } else {
           result.optionalMessage_ = value;
         }
@@ -315,51 +313,51 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearOptionalMessage() {
         result.hasOptionalMessage = false;
-        result.optionalMessage_ = self::TestOptimizedForSize.DefaultInstance;
+        result.optionalMessage_ = global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.DefaultInstance;
         return this;
       }
       
       // repeated .protobuf_unittest.TestOptimizedForSize repeated_message = 2;
-      public scg::IList<self::TestOptimizedForSize> RepeatedMessageList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize> RepeatedMessageList {
         get { return pbc::Lists.AsReadOnly(result.repeatedMessage_); }
       }
       public int RepeatedMessageCount {
         get { return result.RepeatedMessageCount; }
       }
-      public self::TestOptimizedForSize GetRepeatedMessage(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize GetRepeatedMessage(int index) {
         return result.GetRepeatedMessage(index);
       }
-      public Builder SetRepeatedMessage(int index, self::TestOptimizedForSize value) {
+      public Builder SetRepeatedMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize value) {
         result.repeatedMessage_[index] = value;
         return this;
       }
-      public Builder SetRepeatedMessage(int index, self::TestOptimizedForSize.Builder builderForValue) {
+      public Builder SetRepeatedMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.Builder builderForValue) {
         result.repeatedMessage_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddRepeatedMessage(self::TestOptimizedForSize value) {
-        if (result.repeatedMessage_ == pbc::Lists<self::TestOptimizedForSize>.Empty) {
-          result.repeatedMessage_ = new scg::List<self::TestOptimizedForSize>();
+      public Builder AddRepeatedMessage(global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize value) {
+        if (result.repeatedMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>.Empty) {
+          result.repeatedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>();
         }
         result.repeatedMessage_.Add(value);
         return this;
       }
-      public Builder AddRepeatedMessage(self::TestOptimizedForSize.Builder builderForValue) {
-        if (result.repeatedMessage_ == pbc::Lists<self::TestOptimizedForSize>.Empty) {
-          result.repeatedMessage_ = new scg::List<self::TestOptimizedForSize>();
+      public Builder AddRepeatedMessage(global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.Builder builderForValue) {
+        if (result.repeatedMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>.Empty) {
+          result.repeatedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>();
         }
         result.repeatedMessage_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeRepeatedMessage(scg::IEnumerable<self::TestOptimizedForSize> values) {
-        if (result.repeatedMessage_ == pbc::Lists<self::TestOptimizedForSize>.Empty) {
-          result.repeatedMessage_ = new scg::List<self::TestOptimizedForSize>();
+      public Builder AddRangeRepeatedMessage(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize> values) {
+        if (result.repeatedMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>.Empty) {
+          result.repeatedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>();
         }
         base.AddRange(values, result.repeatedMessage_);
         return this;
       }
       public Builder ClearRepeatedMessage() {
-        result.repeatedMessage_ = pbc::Lists<self::TestOptimizedForSize>.Empty;
+        result.repeatedMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize>.Empty;
         return this;
       }
     }
diff --git a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
index 5d5a546b..ff784d47 100644
--- a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
+++ b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs
@@ -4,8 +4,6 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.TestProtos;
-
 namespace Google.ProtocolBuffers.TestProtos {
   
   public static partial class UnitTestImportProtoFile {
@@ -42,8 +40,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_import_ImportMessage__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_import_ImportMessage__Descriptor,
             new string[] { "D", },
-            typeof (self::ImportMessage),
-            typeof (self::ImportMessage.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.ImportMessage),
+            typeof (global::Google.ProtocolBuffers.TestProtos.ImportMessage.Builder));
     #endregion
     
   }
@@ -69,11 +67,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestImportProtoFile.internal__static_protobuf_unittest_import_ImportMessage__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestImportProtoFile.internal__static_protobuf_unittest_import_ImportMessage__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestImportProtoFile.internal__static_protobuf_unittest_import_ImportMessage__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestImportProtoFile.internal__static_protobuf_unittest_import_ImportMessage__FieldAccessorTable; }
     }
     
     // optional int32 d = 1;
@@ -115,35 +113,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::ImportMessage ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.ImportMessage ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::ImportMessage ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.ImportMessage ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ImportMessage ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.ImportMessage ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::ImportMessage ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.ImportMessage ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ImportMessage ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.ImportMessage ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::ImportMessage ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.ImportMessage ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ImportMessage ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.ImportMessage ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::ImportMessage ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.ImportMessage ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -151,26 +149,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::ImportMessage prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.ImportMessage prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::ImportMessage, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.ImportMessage, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::ImportMessage.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.ImportMessage.CreateBuilder()
       internal Builder() {}
       
-      self::ImportMessage result = new self::ImportMessage();
+      global::Google.ProtocolBuffers.TestProtos.ImportMessage result = new global::Google.ProtocolBuffers.TestProtos.ImportMessage();
       
-      protected override self::ImportMessage MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.ImportMessage MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::ImportMessage();
+        result = new global::Google.ProtocolBuffers.TestProtos.ImportMessage();
         return this;
       }
       
@@ -179,30 +177,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::ImportMessage.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.ImportMessage.Descriptor; }
       }
       
-      public override self::ImportMessage DefaultInstanceForType {
-        get { return self::ImportMessage.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.ImportMessage DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.ImportMessage.DefaultInstance; }
       }
       
-      public override self::ImportMessage BuildPartial() {
-        self::ImportMessage returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.ImportMessage BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.ImportMessage returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::ImportMessage) {
-          return MergeFrom((self::ImportMessage) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.ImportMessage) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.ImportMessage) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::ImportMessage other) {
-        if (other == self::ImportMessage.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.ImportMessage other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.ImportMessage.DefaultInstance) return this;
         if (other.HasD) {
           D = other.D;
         }
diff --git a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
index a1189c83..56dd1ca1 100644
--- a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
+++ b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs
@@ -4,8 +4,6 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.TestProtos;
-
 namespace Google.ProtocolBuffers.TestProtos {
   
   public static partial class UnitTestMessageSetProtoFile {
@@ -63,43 +61,43 @@ namespace Google.ProtocolBuffers.TestProtos {
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestMessageSet__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestMessageSet__Descriptor,
             new string[] { },
-            typeof (self::TestMessageSet),
-            typeof (self::TestMessageSet.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMessageSet),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMessageSet.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestMessageSetContainer__Descriptor 
         = Descriptor.MessageTypes[1];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestMessageSetContainer__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestMessageSetContainer__Descriptor,
             new string[] { "MessageSet", },
-            typeof (self::TestMessageSetContainer),
-            typeof (self::TestMessageSetContainer.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestMessageSetExtension1__Descriptor 
         = Descriptor.MessageTypes[2];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestMessageSetExtension1__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestMessageSetExtension1__Descriptor,
             new string[] { "I", },
-            typeof (self::TestMessageSetExtension1),
-            typeof (self::TestMessageSetExtension1.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestMessageSetExtension2__Descriptor 
         = Descriptor.MessageTypes[3];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestMessageSetExtension2__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestMessageSetExtension2__Descriptor,
             new string[] { "Str", },
-            typeof (self::TestMessageSetExtension2),
-            typeof (self::TestMessageSetExtension2.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_RawMessageSet__Descriptor 
         = Descriptor.MessageTypes[4];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_RawMessageSet__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_RawMessageSet__Descriptor,
             new string[] { "Item", },
-            typeof (self::RawMessageSet),
-            typeof (self::RawMessageSet.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.RawMessageSet),
+            typeof (global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Builder));
     internal static readonly pbd::MessageDescriptor  internal__static_protobuf_unittest_RawMessageSet_Item__Descriptor 
         = internal__static_protobuf_unittest_RawMessageSet__Descriptor.NestedTypes[0];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_RawMessageSet_Item__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_RawMessageSet_Item__Descriptor,
             new string[] { "TypeId", "Message", },
-            typeof (self::RawMessageSet.Types.Item),
-            typeof (self::RawMessageSet.Types.Item.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item),
+            typeof (global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.Builder));
     #endregion
     
   }
@@ -119,11 +117,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSet__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSet__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSet__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSet__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -153,35 +151,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestMessageSet ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSet ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMessageSet ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSet ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSet ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSet ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMessageSet ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSet ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSet ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSet ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMessageSet ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSet ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSet ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSet ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMessageSet ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSet ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -189,26 +187,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestMessageSet prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestMessageSet prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::ExtendableBuilder<self::TestMessageSet, self::TestMessageSet.Builder> {
+    public sealed partial class Builder : pb::ExtendableBuilder<global::Google.ProtocolBuffers.TestProtos.TestMessageSet, global::Google.ProtocolBuffers.TestProtos.TestMessageSet.Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestMessageSet.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestMessageSet.CreateBuilder()
       internal Builder() {}
       
-      self::TestMessageSet result = new self::TestMessageSet();
+      global::Google.ProtocolBuffers.TestProtos.TestMessageSet result = new global::Google.ProtocolBuffers.TestProtos.TestMessageSet();
       
-      protected override self::TestMessageSet MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestMessageSet MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestMessageSet();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestMessageSet();
         return this;
       }
       
@@ -217,30 +215,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestMessageSet.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSet.Descriptor; }
       }
       
-      public override self::TestMessageSet DefaultInstanceForType {
-        get { return self::TestMessageSet.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestMessageSet DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSet.DefaultInstance; }
       }
       
-      public override self::TestMessageSet BuildPartial() {
-        self::TestMessageSet returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestMessageSet BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestMessageSet returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestMessageSet) {
-          return MergeFrom((self::TestMessageSet) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestMessageSet) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestMessageSet) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestMessageSet other) {
-        if (other == self::TestMessageSet.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestMessageSet other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMessageSet.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -284,20 +282,20 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetContainer__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetContainer__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetContainer__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetContainer__FieldAccessorTable; }
     }
     
     // optional .protobuf_unittest.TestMessageSet message_set = 1;
     private bool hasMessageSet;
-    private self::TestMessageSet messageSet_ = self::TestMessageSet.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestMessageSet messageSet_ = global::Google.ProtocolBuffers.TestProtos.TestMessageSet.DefaultInstance;
     public bool HasMessageSet {
       get { return hasMessageSet; }
     }
-    public self::TestMessageSet MessageSet {
+    public global::Google.ProtocolBuffers.TestProtos.TestMessageSet MessageSet {
       get { return messageSet_; }
     }
     
@@ -333,35 +331,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestMessageSetContainer ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMessageSetContainer ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSetContainer ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMessageSetContainer ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSetContainer ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMessageSetContainer ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSetContainer ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMessageSetContainer ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -369,26 +367,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestMessageSetContainer prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestMessageSetContainer, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestMessageSetContainer.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer.CreateBuilder()
       internal Builder() {}
       
-      self::TestMessageSetContainer result = new self::TestMessageSetContainer();
+      global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer result = new global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer();
       
-      protected override self::TestMessageSetContainer MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestMessageSetContainer();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer();
         return this;
       }
       
@@ -397,30 +395,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestMessageSetContainer.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer.Descriptor; }
       }
       
-      public override self::TestMessageSetContainer DefaultInstanceForType {
-        get { return self::TestMessageSetContainer.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer.DefaultInstance; }
       }
       
-      public override self::TestMessageSetContainer BuildPartial() {
-        self::TestMessageSetContainer returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestMessageSetContainer) {
-          return MergeFrom((self::TestMessageSetContainer) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestMessageSetContainer other) {
-        if (other == self::TestMessageSetContainer.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMessageSetContainer.DefaultInstance) return this;
         if (other.HasMessageSet) {
           MergeMessageSet(other.MessageSet);
         }
@@ -450,7 +448,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 10: {
-              self::TestMessageSet.Builder subBuilder = self::TestMessageSet.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestMessageSet.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestMessageSet.CreateBuilder();
               if (HasMessageSet) {
                 subBuilder.MergeFrom(MessageSet);
               }
@@ -467,25 +465,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasMessageSet {
         get { return result.HasMessageSet; }
       }
-      public self::TestMessageSet MessageSet {
+      public global::Google.ProtocolBuffers.TestProtos.TestMessageSet MessageSet {
         get { return result.MessageSet; }
         set { SetMessageSet(value); }
       }
-      public Builder SetMessageSet(self::TestMessageSet value) {
+      public Builder SetMessageSet(global::Google.ProtocolBuffers.TestProtos.TestMessageSet value) {
         result.hasMessageSet = true;
         result.messageSet_ = value;
         return this;
       }
-      public Builder SetMessageSet(self::TestMessageSet.Builder builderForValue) {
+      public Builder SetMessageSet(global::Google.ProtocolBuffers.TestProtos.TestMessageSet.Builder builderForValue) {
         result.hasMessageSet = true;
         result.messageSet_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeMessageSet(self::TestMessageSet value) {
+      public Builder MergeMessageSet(global::Google.ProtocolBuffers.TestProtos.TestMessageSet value) {
         if (result.HasMessageSet &&
-            result.messageSet_ != self::TestMessageSet.DefaultInstance) {
+            result.messageSet_ != global::Google.ProtocolBuffers.TestProtos.TestMessageSet.DefaultInstance) {
           result.messageSet_ =
-            self::TestMessageSet.CreateBuilder(result.messageSet_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestMessageSet.CreateBuilder(result.messageSet_).MergeFrom(value).BuildPartial();
         } else {
           result.messageSet_ = value;
         }
@@ -494,7 +492,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearMessageSet() {
         result.hasMessageSet = false;
-        result.messageSet_ = self::TestMessageSet.DefaultInstance;
+        result.messageSet_ = global::Google.ProtocolBuffers.TestProtos.TestMessageSet.DefaultInstance;
         return this;
       }
     }
@@ -511,15 +509,15 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetExtension1__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetExtension1__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetExtension1__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetExtension1__FieldAccessorTable; }
     }
     
-    public static readonly pb::GeneratedExtensionBase<self::TestMessageSetExtension1> MessageSetExtension =
-          pb::GeneratedSingleExtension<self::TestMessageSetExtension1>.CreateInstance(Descriptor.Extensions[0]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1> MessageSetExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1>.CreateInstance(Descriptor.Extensions[0]);
     #region Nested types
     public static class Types {
     }
@@ -564,35 +562,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestMessageSetExtension1 ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMessageSetExtension1 ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSetExtension1 ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMessageSetExtension1 ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSetExtension1 ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMessageSetExtension1 ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSetExtension1 ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMessageSetExtension1 ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -600,26 +598,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestMessageSetExtension1 prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestMessageSetExtension1, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestMessageSetExtension1.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1.CreateBuilder()
       internal Builder() {}
       
-      self::TestMessageSetExtension1 result = new self::TestMessageSetExtension1();
+      global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 result = new global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1();
       
-      protected override self::TestMessageSetExtension1 MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestMessageSetExtension1();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1();
         return this;
       }
       
@@ -628,30 +626,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestMessageSetExtension1.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1.Descriptor; }
       }
       
-      public override self::TestMessageSetExtension1 DefaultInstanceForType {
-        get { return self::TestMessageSetExtension1.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1.DefaultInstance; }
       }
       
-      public override self::TestMessageSetExtension1 BuildPartial() {
-        self::TestMessageSetExtension1 returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestMessageSetExtension1) {
-          return MergeFrom((self::TestMessageSetExtension1) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestMessageSetExtension1 other) {
-        if (other == self::TestMessageSetExtension1.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1 other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension1.DefaultInstance) return this;
         if (other.HasI) {
           I = other.I;
         }
@@ -721,15 +719,15 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetExtension2__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetExtension2__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetExtension2__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_TestMessageSetExtension2__FieldAccessorTable; }
     }
     
-    public static readonly pb::GeneratedExtensionBase<self::TestMessageSetExtension2> MessageSetExtension =
-          pb::GeneratedSingleExtension<self::TestMessageSetExtension2>.CreateInstance(Descriptor.Extensions[0]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2> MessageSetExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2>.CreateInstance(Descriptor.Extensions[0]);
     #region Nested types
     public static class Types {
     }
@@ -774,35 +772,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestMessageSetExtension2 ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMessageSetExtension2 ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSetExtension2 ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMessageSetExtension2 ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSetExtension2 ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMessageSetExtension2 ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMessageSetExtension2 ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMessageSetExtension2 ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -810,26 +808,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestMessageSetExtension2 prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestMessageSetExtension2, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestMessageSetExtension2.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2.CreateBuilder()
       internal Builder() {}
       
-      self::TestMessageSetExtension2 result = new self::TestMessageSetExtension2();
+      global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 result = new global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2();
       
-      protected override self::TestMessageSetExtension2 MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestMessageSetExtension2();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2();
         return this;
       }
       
@@ -838,30 +836,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestMessageSetExtension2.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2.Descriptor; }
       }
       
-      public override self::TestMessageSetExtension2 DefaultInstanceForType {
-        get { return self::TestMessageSetExtension2.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2.DefaultInstance; }
       }
       
-      public override self::TestMessageSetExtension2 BuildPartial() {
-        self::TestMessageSetExtension2 returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestMessageSetExtension2) {
-          return MergeFrom((self::TestMessageSetExtension2) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestMessageSetExtension2 other) {
-        if (other == self::TestMessageSetExtension2.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2 other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMessageSetExtension2.DefaultInstance) return this;
         if (other.HasStr) {
           Str = other.Str;
         }
@@ -931,11 +929,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_RawMessageSet__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_RawMessageSet__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_RawMessageSet__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_RawMessageSet__FieldAccessorTable; }
     }
     
     #region Nested types
@@ -951,11 +949,11 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         
         public static pbd::MessageDescriptor Descriptor {
-          get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_RawMessageSet_Item__Descriptor; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_RawMessageSet_Item__Descriptor; }
         }
         
         protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-          get { return self::UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_RawMessageSet_Item__FieldAccessorTable; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestMessageSetProtoFile.internal__static_protobuf_unittest_RawMessageSet_Item__FieldAccessorTable; }
         }
         
         // required int32 type_id = 2;
@@ -1015,35 +1013,35 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
         }
         
-        public static self::RawMessageSet.Types.Item ParseFrom(pb::ByteString data) {
+        public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item ParseFrom(pb::ByteString data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::RawMessageSet.Types.Item ParseFrom(pb::ByteString data,
+        public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item ParseFrom(pb::ByteString data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::RawMessageSet.Types.Item ParseFrom(byte[] data) {
+        public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item ParseFrom(byte[] data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::RawMessageSet.Types.Item ParseFrom(byte[] data,
+        public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item ParseFrom(byte[] data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::RawMessageSet.Types.Item ParseFrom(global::System.IO.Stream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item ParseFrom(global::System.IO.Stream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::RawMessageSet.Types.Item ParseFrom(
+        public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item ParseFrom(
             global::System.IO.Stream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::RawMessageSet.Types.Item ParseFrom(pb::CodedInputStream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item ParseFrom(pb::CodedInputStream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::RawMessageSet.Types.Item ParseFrom(pb::CodedInputStream input,
+        public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item ParseFrom(pb::CodedInputStream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
@@ -1051,26 +1049,26 @@ namespace Google.ProtocolBuffers.TestProtos {
         
         public static Builder CreateBuilder() { return new Builder(); }
         public override Builder CreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder(self::RawMessageSet.Types.Item prototype) {
+        public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item prototype) {
           return (Builder) new Builder().MergeFrom(prototype);
         }
         
-        public sealed partial class Builder : pb::GeneratedBuilder<self::RawMessageSet.Types.Item, Builder> {
+        public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item, Builder> {
           protected override Builder ThisBuilder {
             get { return this; }
           }
           
-          // Construct using self::RawMessageSet.Types.Item.CreateBuilder()
+          // Construct using global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.CreateBuilder()
           internal Builder() {}
           
-          self::RawMessageSet.Types.Item result = new self::RawMessageSet.Types.Item();
+          global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item result = new global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item();
           
-          protected override self::RawMessageSet.Types.Item MessageBeingBuilt {
+          protected override global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item MessageBeingBuilt {
             get { return result; }
           }
           
           public override Builder Clear() {
-            result = new self::RawMessageSet.Types.Item();
+            result = new global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item();
             return this;
           }
           
@@ -1079,30 +1077,30 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return self::RawMessageSet.Types.Item.Descriptor; }
+            get { return global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.Descriptor; }
           }
           
-          public override self::RawMessageSet.Types.Item DefaultInstanceForType {
-            get { return self::RawMessageSet.Types.Item.DefaultInstance; }
+          public override global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item DefaultInstanceForType {
+            get { return global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.DefaultInstance; }
           }
           
-          public override self::RawMessageSet.Types.Item BuildPartial() {
-            self::RawMessageSet.Types.Item returnMe = result;
+          public override global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item BuildPartial() {
+            global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item returnMe = result;
             result = null;
             return returnMe;
           }
           
           public override Builder MergeFrom(pb::IMessage other) {
-            if (other is self::RawMessageSet.Types.Item) {
-              return MergeFrom((self::RawMessageSet.Types.Item) other);
+            if (other is global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item) {
+              return MergeFrom((global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item) other);
             } else {
               base.MergeFrom(other);
               return this;
             }
           }
           
-          public override Builder MergeFrom(self::RawMessageSet.Types.Item other) {
-            if (other == self::RawMessageSet.Types.Item.DefaultInstance) return this;
+          public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item other) {
+            if (other == global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.DefaultInstance) return this;
             if (other.HasTypeId) {
               TypeId = other.TypeId;
             }
@@ -1191,20 +1189,20 @@ namespace Google.ProtocolBuffers.TestProtos {
     #endregion
     
     // repeated group Item = 1 {
-    private scg::IList<self::RawMessageSet.Types.Item> item_ = pbc::Lists<self::RawMessageSet.Types.Item>.Empty;
-    public scg::IList<self::RawMessageSet.Types.Item> ItemList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item> item_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item> ItemList {
       get { return item_; } 
     }
     public int ItemCount
       { get { return item_.Count; }
     }
-    public self::RawMessageSet.Types.Item GetItem(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item GetItem(int index) {
       return item_ [index];
     }
     
     public override bool IsInitialized {
       get {
-        foreach (self::RawMessageSet.Types.Item element in ItemList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item element in ItemList) {
           if (!element.IsInitialized) return false;
         }
         return true;
@@ -1212,7 +1210,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public override void WriteTo(pb::CodedOutputStream output) {
-      foreach (self::RawMessageSet.Types.Item element in ItemList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item element in ItemList) {
         output.WriteGroup(1, element);
       }
       UnknownFields.WriteTo(output);
@@ -1225,7 +1223,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         if (size != -1) return size;
         
         size = 0;
-        foreach (self::RawMessageSet.Types.Item element in ItemList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item element in ItemList) {
           size += pb::CodedOutputStream.ComputeGroupSize(1, element);
         }
         size += UnknownFields.SerializedSize;
@@ -1234,35 +1232,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::RawMessageSet ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::RawMessageSet ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::RawMessageSet ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::RawMessageSet ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::RawMessageSet ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::RawMessageSet ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::RawMessageSet ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::RawMessageSet ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.RawMessageSet ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -1270,26 +1268,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::RawMessageSet prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.RawMessageSet prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::RawMessageSet, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.RawMessageSet, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::RawMessageSet.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.RawMessageSet.CreateBuilder()
       internal Builder() {}
       
-      self::RawMessageSet result = new self::RawMessageSet();
+      global::Google.ProtocolBuffers.TestProtos.RawMessageSet result = new global::Google.ProtocolBuffers.TestProtos.RawMessageSet();
       
-      protected override self::RawMessageSet MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.RawMessageSet MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::RawMessageSet();
+        result = new global::Google.ProtocolBuffers.TestProtos.RawMessageSet();
         return this;
       }
       
@@ -1298,36 +1296,36 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::RawMessageSet.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Descriptor; }
       }
       
-      public override self::RawMessageSet DefaultInstanceForType {
-        get { return self::RawMessageSet.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.RawMessageSet DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.RawMessageSet.DefaultInstance; }
       }
       
-      public override self::RawMessageSet BuildPartial() {
-        if (result.item_ != pbc::Lists<self::RawMessageSet.Types.Item>.Empty) {
-          result.item_ = pbc::Lists<self::RawMessageSet.Types.Item>.AsReadOnly(result.item_);
+      public override global::Google.ProtocolBuffers.TestProtos.RawMessageSet BuildPartial() {
+        if (result.item_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>.Empty) {
+          result.item_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>.AsReadOnly(result.item_);
         }
-        self::RawMessageSet returnMe = result;
+        global::Google.ProtocolBuffers.TestProtos.RawMessageSet returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::RawMessageSet) {
-          return MergeFrom((self::RawMessageSet) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.RawMessageSet) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.RawMessageSet) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::RawMessageSet other) {
-        if (other == self::RawMessageSet.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.RawMessageSet other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.RawMessageSet.DefaultInstance) return this;
         if (other.item_.Count != 0) {
           if (result.item_.Count == 0) {
-            result.item_ = new scg::List<self::RawMessageSet.Types.Item>();
+            result.item_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>();
           }
           base.AddRange(other.item_, result.item_);
         }
@@ -1357,7 +1355,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 11: {
-              self::RawMessageSet.Types.Item.Builder subBuilder = self::RawMessageSet.Types.Item.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.CreateBuilder();
               input.ReadGroup(1, subBuilder, extensionRegistry);
               AddItem(subBuilder.BuildPartial());
               break;
@@ -1368,46 +1366,46 @@ namespace Google.ProtocolBuffers.TestProtos {
       
       
       // repeated group Item = 1 {
-      public scg::IList<self::RawMessageSet.Types.Item> ItemList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item> ItemList {
         get { return pbc::Lists.AsReadOnly(result.item_); }
       }
       public int ItemCount {
         get { return result.ItemCount; }
       }
-      public self::RawMessageSet.Types.Item GetItem(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item GetItem(int index) {
         return result.GetItem(index);
       }
-      public Builder SetItem(int index, self::RawMessageSet.Types.Item value) {
+      public Builder SetItem(int index, global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item value) {
         result.item_[index] = value;
         return this;
       }
-      public Builder SetItem(int index, self::RawMessageSet.Types.Item.Builder builderForValue) {
+      public Builder SetItem(int index, global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.Builder builderForValue) {
         result.item_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddItem(self::RawMessageSet.Types.Item value) {
-        if (result.item_ == pbc::Lists<self::RawMessageSet.Types.Item>.Empty) {
-          result.item_ = new scg::List<self::RawMessageSet.Types.Item>();
+      public Builder AddItem(global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item value) {
+        if (result.item_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>.Empty) {
+          result.item_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>();
         }
         result.item_.Add(value);
         return this;
       }
-      public Builder AddItem(self::RawMessageSet.Types.Item.Builder builderForValue) {
-        if (result.item_ == pbc::Lists<self::RawMessageSet.Types.Item>.Empty) {
-          result.item_ = new scg::List<self::RawMessageSet.Types.Item>();
+      public Builder AddItem(global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item.Builder builderForValue) {
+        if (result.item_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>.Empty) {
+          result.item_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>();
         }
         result.item_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeItem(scg::IEnumerable<self::RawMessageSet.Types.Item> values) {
-        if (result.item_ == pbc::Lists<self::RawMessageSet.Types.Item>.Empty) {
-          result.item_ = new scg::List<self::RawMessageSet.Types.Item>();
+      public Builder AddRangeItem(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item> values) {
+        if (result.item_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>.Empty) {
+          result.item_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>();
         }
         base.AddRange(values, result.item_);
         return this;
       }
       public Builder ClearItem() {
-        result.item_ = pbc::Lists<self::RawMessageSet.Types.Item>.Empty;
+        result.item_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.RawMessageSet.Types.Item>.Empty;
         return this;
       }
     }
diff --git a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
index 46b90843..5315b95e 100644
--- a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
+++ b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs
@@ -4,8 +4,6 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.TestProtos;
-
 namespace Google.ProtocolBuffers.TestProtos {
   
   public static partial class UnitTestOptimizeForProtoFile {
@@ -34,7 +32,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             0x55, 0x6e, 0x69, 0x74, 0x54, 0x65, 0x73, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x46, 0x6f, 0x72, 0x50, 
             0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, 0x6c, 0x65, 
         }, new pbd::FileDescriptor[] {
-                self::UnitTestProtoFile.Descriptor,
+                global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor,
         });
     #endregion
     
@@ -47,8 +45,8 @@ namespace Google.ProtocolBuffers.TestProtos {
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestOptimizedForSize__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestOptimizedForSize__Descriptor,
             new string[] { "I", "Msg", },
-            typeof (self::TestOptimizedForSize),
-            typeof (self::TestOptimizedForSize.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.Builder));
     #endregion
     
   }
@@ -68,11 +66,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestOptimizeForProtoFile.internal__static_protobuf_unittest_TestOptimizedForSize__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.internal__static_protobuf_unittest_TestOptimizedForSize__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestOptimizeForProtoFile.internal__static_protobuf_unittest_TestOptimizedForSize__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestOptimizeForProtoFile.internal__static_protobuf_unittest_TestOptimizedForSize__FieldAccessorTable; }
     }
     
     public static readonly pb::GeneratedExtensionBase<int> TestExtension =
@@ -94,43 +92,43 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     // optional .protobuf_unittest.ForeignMessage msg = 19;
     private bool hasMsg;
-    private self::ForeignMessage msg_ = self::ForeignMessage.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.ForeignMessage msg_ = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance;
     public bool HasMsg {
       get { return hasMsg; }
     }
-    public self::ForeignMessage Msg {
+    public global::Google.ProtocolBuffers.TestProtos.ForeignMessage Msg {
       get { return msg_; }
     }
     
-    public static self::TestOptimizedForSize ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestOptimizedForSize ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestOptimizedForSize ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestOptimizedForSize ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestOptimizedForSize ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestOptimizedForSize ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestOptimizedForSize ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestOptimizedForSize ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -138,26 +136,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestOptimizedForSize prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::ExtendableBuilder<self::TestOptimizedForSize, self::TestOptimizedForSize.Builder> {
+    public sealed partial class Builder : pb::ExtendableBuilder<global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize, global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestOptimizedForSize.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.CreateBuilder()
       internal Builder() {}
       
-      self::TestOptimizedForSize result = new self::TestOptimizedForSize();
+      global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize result = new global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize();
       
-      protected override self::TestOptimizedForSize MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestOptimizedForSize();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize();
         return this;
       }
       
@@ -166,15 +164,15 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestOptimizedForSize.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.Descriptor; }
       }
       
-      public override self::TestOptimizedForSize DefaultInstanceForType {
-        get { return self::TestOptimizedForSize.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize.DefaultInstance; }
       }
       
-      public override self::TestOptimizedForSize BuildPartial() {
-        self::TestOptimizedForSize returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestOptimizedForSize returnMe = result;
         result = null;
         return returnMe;
       }
@@ -203,25 +201,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasMsg {
         get { return result.HasMsg; }
       }
-      public self::ForeignMessage Msg {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignMessage Msg {
         get { return result.Msg; }
         set { SetMsg(value); }
       }
-      public Builder SetMsg(self::ForeignMessage value) {
+      public Builder SetMsg(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
         result.hasMsg = true;
         result.msg_ = value;
         return this;
       }
-      public Builder SetMsg(self::ForeignMessage.Builder builderForValue) {
+      public Builder SetMsg(global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) {
         result.hasMsg = true;
         result.msg_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeMsg(self::ForeignMessage value) {
+      public Builder MergeMsg(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
         if (result.HasMsg &&
-            result.msg_ != self::ForeignMessage.DefaultInstance) {
+            result.msg_ != global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance) {
           result.msg_ =
-            self::ForeignMessage.CreateBuilder(result.msg_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder(result.msg_).MergeFrom(value).BuildPartial();
         } else {
           result.msg_ = value;
         }
@@ -230,7 +228,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearMsg() {
         result.hasMsg = false;
-        result.msg_ = self::ForeignMessage.DefaultInstance;
+        result.msg_ = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance;
         return this;
       }
     }
diff --git a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
index 9a22a800..0c75f4a1 100644
--- a/csharp/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
+++ b/csharp/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs
@@ -4,8 +4,6 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.TestProtos;
-
 namespace Google.ProtocolBuffers.TestProtos {
   
   public static partial class UnitTestProtoFile {
@@ -627,7 +625,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             0x73, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0xca, 0x3e, 0x11, 0x55, 0x6e, 0x69, 0x74, 0x54, 
             0x65, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x46, 0x69, 0x6c, 0x65, 
         }, new pbd::FileDescriptor[] {
-                self::UnitTestImportProtoFile.Descriptor,
+                global::Google.ProtocolBuffers.TestProtos.UnitTestImportProtoFile.Descriptor,
         });
     #endregion
     
@@ -662,20 +660,20 @@ namespace Google.ProtocolBuffers.TestProtos {
           pb::GeneratedSingleExtension<string>.CreateInstance(Descriptor.Extensions[13]);
     public static readonly pb::GeneratedExtensionBase<pb::ByteString> OptionalBytesExtension =
           pb::GeneratedSingleExtension<pb::ByteString>.CreateInstance(Descriptor.Extensions[14]);
-    public static readonly pb::GeneratedExtensionBase<self::OptionalGroup_extension> OptionalGroupExtension =
-          pb::GeneratedSingleExtension<self::OptionalGroup_extension>.CreateInstance(Descriptor.Extensions[15]);
-    public static readonly pb::GeneratedExtensionBase<self::TestAllTypes.Types.NestedMessage> OptionalNestedMessageExtension =
-          pb::GeneratedSingleExtension<self::TestAllTypes.Types.NestedMessage>.CreateInstance(Descriptor.Extensions[16]);
-    public static readonly pb::GeneratedExtensionBase<self::ForeignMessage> OptionalForeignMessageExtension =
-          pb::GeneratedSingleExtension<self::ForeignMessage>.CreateInstance(Descriptor.Extensions[17]);
-    public static readonly pb::GeneratedExtensionBase<self::ImportMessage> OptionalImportMessageExtension =
-          pb::GeneratedSingleExtension<self::ImportMessage>.CreateInstance(Descriptor.Extensions[18]);
-    public static readonly pb::GeneratedExtensionBase<self::TestAllTypes.Types.NestedEnum> OptionalNestedEnumExtension =
-          pb::GeneratedSingleExtension<self::TestAllTypes.Types.NestedEnum>.CreateInstance(Descriptor.Extensions[19]);
-    public static readonly pb::GeneratedExtensionBase<self::ForeignEnum> OptionalForeignEnumExtension =
-          pb::GeneratedSingleExtension<self::ForeignEnum>.CreateInstance(Descriptor.Extensions[20]);
-    public static readonly pb::GeneratedExtensionBase<self::ImportEnum> OptionalImportEnumExtension =
-          pb::GeneratedSingleExtension<self::ImportEnum>.CreateInstance(Descriptor.Extensions[21]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension> OptionalGroupExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension>.CreateInstance(Descriptor.Extensions[15]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage> OptionalNestedMessageExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>.CreateInstance(Descriptor.Extensions[16]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> OptionalForeignMessageExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.CreateInstance(Descriptor.Extensions[17]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.ImportMessage> OptionalImportMessageExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.ImportMessage>.CreateInstance(Descriptor.Extensions[18]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum> OptionalNestedEnumExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum>.CreateInstance(Descriptor.Extensions[19]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> OptionalForeignEnumExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>.CreateInstance(Descriptor.Extensions[20]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.ImportEnum> OptionalImportEnumExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.ImportEnum>.CreateInstance(Descriptor.Extensions[21]);
     public static readonly pb::GeneratedExtensionBase<string> OptionalStringPieceExtension =
           pb::GeneratedSingleExtension<string>.CreateInstance(Descriptor.Extensions[22]);
     public static readonly pb::GeneratedExtensionBase<string> OptionalCordExtension =
@@ -726,26 +724,26 @@ namespace Google.ProtocolBuffers.TestProtos {
       pb::GeneratedExtensionBase<scg::IList<pb::ByteString>> RepeatedBytesExtension =
           pb::GeneratedRepeatExtension<pb::ByteString>.CreateInstance(Descriptor.Extensions[38]);
     public static readonly
-      pb::GeneratedExtensionBase<scg::IList<self::RepeatedGroup_extension>> RepeatedGroupExtension =
-          pb::GeneratedRepeatExtension<self::RepeatedGroup_extension>.CreateInstance(Descriptor.Extensions[39]);
+      pb::GeneratedExtensionBase<scg::IList<global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension>> RepeatedGroupExtension =
+          pb::GeneratedRepeatExtension<global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension>.CreateInstance(Descriptor.Extensions[39]);
     public static readonly
-      pb::GeneratedExtensionBase<scg::IList<self::TestAllTypes.Types.NestedMessage>> RepeatedNestedMessageExtension =
-          pb::GeneratedRepeatExtension<self::TestAllTypes.Types.NestedMessage>.CreateInstance(Descriptor.Extensions[40]);
+      pb::GeneratedExtensionBase<scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>> RepeatedNestedMessageExtension =
+          pb::GeneratedRepeatExtension<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>.CreateInstance(Descriptor.Extensions[40]);
     public static readonly
-      pb::GeneratedExtensionBase<scg::IList<self::ForeignMessage>> RepeatedForeignMessageExtension =
-          pb::GeneratedRepeatExtension<self::ForeignMessage>.CreateInstance(Descriptor.Extensions[41]);
+      pb::GeneratedExtensionBase<scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>> RepeatedForeignMessageExtension =
+          pb::GeneratedRepeatExtension<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.CreateInstance(Descriptor.Extensions[41]);
     public static readonly
-      pb::GeneratedExtensionBase<scg::IList<self::ImportMessage>> RepeatedImportMessageExtension =
-          pb::GeneratedRepeatExtension<self::ImportMessage>.CreateInstance(Descriptor.Extensions[42]);
+      pb::GeneratedExtensionBase<scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportMessage>> RepeatedImportMessageExtension =
+          pb::GeneratedRepeatExtension<global::Google.ProtocolBuffers.TestProtos.ImportMessage>.CreateInstance(Descriptor.Extensions[42]);
     public static readonly
-      pb::GeneratedExtensionBase<scg::IList<self::TestAllTypes.Types.NestedEnum>> RepeatedNestedEnumExtension =
-          pb::GeneratedRepeatExtension<self::TestAllTypes.Types.NestedEnum>.CreateInstance(Descriptor.Extensions[43]);
+      pb::GeneratedExtensionBase<scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum>> RepeatedNestedEnumExtension =
+          pb::GeneratedRepeatExtension<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum>.CreateInstance(Descriptor.Extensions[43]);
     public static readonly
-      pb::GeneratedExtensionBase<scg::IList<self::ForeignEnum>> RepeatedForeignEnumExtension =
-          pb::GeneratedRepeatExtension<self::ForeignEnum>.CreateInstance(Descriptor.Extensions[44]);
+      pb::GeneratedExtensionBase<scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>> RepeatedForeignEnumExtension =
+          pb::GeneratedRepeatExtension<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>.CreateInstance(Descriptor.Extensions[44]);
     public static readonly
-      pb::GeneratedExtensionBase<scg::IList<self::ImportEnum>> RepeatedImportEnumExtension =
-          pb::GeneratedRepeatExtension<self::ImportEnum>.CreateInstance(Descriptor.Extensions[45]);
+      pb::GeneratedExtensionBase<scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportEnum>> RepeatedImportEnumExtension =
+          pb::GeneratedRepeatExtension<global::Google.ProtocolBuffers.TestProtos.ImportEnum>.CreateInstance(Descriptor.Extensions[45]);
     public static readonly
       pb::GeneratedExtensionBase<scg::IList<string>> RepeatedStringPieceExtension =
           pb::GeneratedRepeatExtension<string>.CreateInstance(Descriptor.Extensions[46]);
@@ -782,12 +780,12 @@ namespace Google.ProtocolBuffers.TestProtos {
           pb::GeneratedSingleExtension<string>.CreateInstance(Descriptor.Extensions[61]);
     public static readonly pb::GeneratedExtensionBase<pb::ByteString> DefaultBytesExtension =
           pb::GeneratedSingleExtension<pb::ByteString>.CreateInstance(Descriptor.Extensions[62]);
-    public static readonly pb::GeneratedExtensionBase<self::TestAllTypes.Types.NestedEnum> DefaultNestedEnumExtension =
-          pb::GeneratedSingleExtension<self::TestAllTypes.Types.NestedEnum>.CreateInstance(Descriptor.Extensions[63]);
-    public static readonly pb::GeneratedExtensionBase<self::ForeignEnum> DefaultForeignEnumExtension =
-          pb::GeneratedSingleExtension<self::ForeignEnum>.CreateInstance(Descriptor.Extensions[64]);
-    public static readonly pb::GeneratedExtensionBase<self::ImportEnum> DefaultImportEnumExtension =
-          pb::GeneratedSingleExtension<self::ImportEnum>.CreateInstance(Descriptor.Extensions[65]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum> DefaultNestedEnumExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum>.CreateInstance(Descriptor.Extensions[63]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> DefaultForeignEnumExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>.CreateInstance(Descriptor.Extensions[64]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.ImportEnum> DefaultImportEnumExtension =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.ImportEnum>.CreateInstance(Descriptor.Extensions[65]);
     public static readonly pb::GeneratedExtensionBase<string> DefaultStringPieceExtension =
           pb::GeneratedSingleExtension<string>.CreateInstance(Descriptor.Extensions[66]);
     public static readonly pb::GeneratedExtensionBase<string> DefaultCordExtension =
@@ -804,204 +802,204 @@ namespace Google.ProtocolBuffers.TestProtos {
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestAllTypes__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestAllTypes__Descriptor,
             new string[] { "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalGroup", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalImportMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalImportEnum", "OptionalStringPiece", "OptionalCord", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedGroup", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedImportMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "RepeatedImportEnum", "RepeatedStringPiece", "RepeatedCord", "DefaultInt32", "DefaultInt64", "DefaultUint32", "DefaultUint64", "DefaultSint32", "DefaultSint64", "DefaultFixed32", "DefaultFixed64", "DefaultSfixed32", "DefaultSfixed64", "DefaultFloat", "DefaultDouble", "DefaultBool", "DefaultString", "DefaultBytes", "DefaultNestedEnum", "DefaultForeignEnum", "DefaultImportEnum", "DefaultStringPiece", "DefaultCord", },
-            typeof (self::TestAllTypes),
-            typeof (self::TestAllTypes.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllTypes),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder));
     internal static readonly pbd::MessageDescriptor  internal__static_protobuf_unittest_TestAllTypes_NestedMessage__Descriptor 
         = internal__static_protobuf_unittest_TestAllTypes__Descriptor.NestedTypes[0];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestAllTypes_NestedMessage__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestAllTypes_NestedMessage__Descriptor,
             new string[] { "Bb", },
-            typeof (self::TestAllTypes.Types.NestedMessage),
-            typeof (self::TestAllTypes.Types.NestedMessage.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder));
     internal static readonly pbd::MessageDescriptor  internal__static_protobuf_unittest_TestAllTypes_OptionalGroup__Descriptor 
         = internal__static_protobuf_unittest_TestAllTypes__Descriptor.NestedTypes[1];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestAllTypes_OptionalGroup__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestAllTypes_OptionalGroup__Descriptor,
             new string[] { "A", },
-            typeof (self::TestAllTypes.Types.OptionalGroup),
-            typeof (self::TestAllTypes.Types.OptionalGroup.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.Builder));
     internal static readonly pbd::MessageDescriptor  internal__static_protobuf_unittest_TestAllTypes_RepeatedGroup__Descriptor 
         = internal__static_protobuf_unittest_TestAllTypes__Descriptor.NestedTypes[2];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestAllTypes_RepeatedGroup__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestAllTypes_RepeatedGroup__Descriptor,
             new string[] { "A", },
-            typeof (self::TestAllTypes.Types.RepeatedGroup),
-            typeof (self::TestAllTypes.Types.RepeatedGroup.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_ForeignMessage__Descriptor 
         = Descriptor.MessageTypes[1];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_ForeignMessage__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_ForeignMessage__Descriptor,
             new string[] { "C", },
-            typeof (self::ForeignMessage),
-            typeof (self::ForeignMessage.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.ForeignMessage),
+            typeof (global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestAllExtensions__Descriptor 
         = Descriptor.MessageTypes[2];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestAllExtensions__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestAllExtensions__Descriptor,
             new string[] { },
-            typeof (self::TestAllExtensions),
-            typeof (self::TestAllExtensions.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllExtensions),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestAllExtensions.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_OptionalGroup_extension__Descriptor 
         = Descriptor.MessageTypes[3];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_OptionalGroup_extension__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_OptionalGroup_extension__Descriptor,
             new string[] { "A", },
-            typeof (self::OptionalGroup_extension),
-            typeof (self::OptionalGroup_extension.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension),
+            typeof (global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_RepeatedGroup_extension__Descriptor 
         = Descriptor.MessageTypes[4];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_RepeatedGroup_extension__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_RepeatedGroup_extension__Descriptor,
             new string[] { "A", },
-            typeof (self::RepeatedGroup_extension),
-            typeof (self::RepeatedGroup_extension.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension),
+            typeof (global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestRequired__Descriptor 
         = Descriptor.MessageTypes[5];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestRequired__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestRequired__Descriptor,
             new string[] { "A", "Dummy2", "B", "Dummy4", "Dummy5", "Dummy6", "Dummy7", "Dummy8", "Dummy9", "Dummy10", "Dummy11", "Dummy12", "Dummy13", "Dummy14", "Dummy15", "Dummy16", "Dummy17", "Dummy18", "Dummy19", "Dummy20", "Dummy21", "Dummy22", "Dummy23", "Dummy24", "Dummy25", "Dummy26", "Dummy27", "Dummy28", "Dummy29", "Dummy30", "Dummy31", "Dummy32", "C", },
-            typeof (self::TestRequired),
-            typeof (self::TestRequired.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestRequired),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestRequiredForeign__Descriptor 
         = Descriptor.MessageTypes[6];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestRequiredForeign__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestRequiredForeign__Descriptor,
             new string[] { "OptionalMessage", "RepeatedMessage", "Dummy", },
-            typeof (self::TestRequiredForeign),
-            typeof (self::TestRequiredForeign.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestForeignNested__Descriptor 
         = Descriptor.MessageTypes[7];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestForeignNested__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestForeignNested__Descriptor,
             new string[] { "ForeignNested", },
-            typeof (self::TestForeignNested),
-            typeof (self::TestForeignNested.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestForeignNested),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestForeignNested.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestEmptyMessage__Descriptor 
         = Descriptor.MessageTypes[8];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestEmptyMessage__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestEmptyMessage__Descriptor,
             new string[] { },
-            typeof (self::TestEmptyMessage),
-            typeof (self::TestEmptyMessage.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestEmptyMessageWithExtensions__Descriptor 
         = Descriptor.MessageTypes[9];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestEmptyMessageWithExtensions__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestEmptyMessageWithExtensions__Descriptor,
             new string[] { },
-            typeof (self::TestEmptyMessageWithExtensions),
-            typeof (self::TestEmptyMessageWithExtensions.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestReallyLargeTagNumber__Descriptor 
         = Descriptor.MessageTypes[10];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestReallyLargeTagNumber__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestReallyLargeTagNumber__Descriptor,
             new string[] { "A", "Bb", },
-            typeof (self::TestReallyLargeTagNumber),
-            typeof (self::TestReallyLargeTagNumber.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestRecursiveMessage__Descriptor 
         = Descriptor.MessageTypes[11];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestRecursiveMessage__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestRecursiveMessage__Descriptor,
             new string[] { "A", "I", },
-            typeof (self::TestRecursiveMessage),
-            typeof (self::TestRecursiveMessage.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestMutualRecursionA__Descriptor 
         = Descriptor.MessageTypes[12];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestMutualRecursionA__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestMutualRecursionA__Descriptor,
             new string[] { "Bb", },
-            typeof (self::TestMutualRecursionA),
-            typeof (self::TestMutualRecursionA.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestMutualRecursionB__Descriptor 
         = Descriptor.MessageTypes[13];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestMutualRecursionB__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestMutualRecursionB__Descriptor,
             new string[] { "A", "OptionalInt32", },
-            typeof (self::TestMutualRecursionB),
-            typeof (self::TestMutualRecursionB.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestDupFieldNumber__Descriptor 
         = Descriptor.MessageTypes[14];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestDupFieldNumber__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestDupFieldNumber__Descriptor,
             new string[] { "A", "Foo", "Bar", },
-            typeof (self::TestDupFieldNumber),
-            typeof (self::TestDupFieldNumber.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Builder));
     internal static readonly pbd::MessageDescriptor  internal__static_protobuf_unittest_TestDupFieldNumber_Foo__Descriptor 
         = internal__static_protobuf_unittest_TestDupFieldNumber__Descriptor.NestedTypes[0];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestDupFieldNumber_Foo__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestDupFieldNumber_Foo__Descriptor,
             new string[] { "A", },
-            typeof (self::TestDupFieldNumber.Types.Foo),
-            typeof (self::TestDupFieldNumber.Types.Foo.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.Builder));
     internal static readonly pbd::MessageDescriptor  internal__static_protobuf_unittest_TestDupFieldNumber_Bar__Descriptor 
         = internal__static_protobuf_unittest_TestDupFieldNumber__Descriptor.NestedTypes[1];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestDupFieldNumber_Bar__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestDupFieldNumber_Bar__Descriptor,
             new string[] { "A", },
-            typeof (self::TestDupFieldNumber.Types.Bar),
-            typeof (self::TestDupFieldNumber.Types.Bar.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestNestedMessageHasBits__Descriptor 
         = Descriptor.MessageTypes[15];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestNestedMessageHasBits__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestNestedMessageHasBits__Descriptor,
             new string[] { "OptionalNestedMessage", },
-            typeof (self::TestNestedMessageHasBits),
-            typeof (self::TestNestedMessageHasBits.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Builder));
     internal static readonly pbd::MessageDescriptor  internal__static_protobuf_unittest_TestNestedMessageHasBits_NestedMessage__Descriptor 
         = internal__static_protobuf_unittest_TestNestedMessageHasBits__Descriptor.NestedTypes[0];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestNestedMessageHasBits_NestedMessage__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestNestedMessageHasBits_NestedMessage__Descriptor,
             new string[] { "NestedmessageRepeatedInt32", "NestedmessageRepeatedForeignmessage", },
-            typeof (self::TestNestedMessageHasBits.Types.NestedMessage),
-            typeof (self::TestNestedMessageHasBits.Types.NestedMessage.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestCamelCaseFieldNames__Descriptor 
         = Descriptor.MessageTypes[16];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestCamelCaseFieldNames__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestCamelCaseFieldNames__Descriptor,
             new string[] { "PrimitiveField", "StringField", "EnumField", "MessageField", "StringPieceField", "CordField", "RepeatedPrimitiveField", "RepeatedStringField", "RepeatedEnumField", "RepeatedMessageField", "RepeatedStringPieceField", "RepeatedCordField", },
-            typeof (self::TestCamelCaseFieldNames),
-            typeof (self::TestCamelCaseFieldNames.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestFieldOrderings__Descriptor 
         = Descriptor.MessageTypes[17];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestFieldOrderings__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestFieldOrderings__Descriptor,
             new string[] { "MyString", "MyInt", "MyFloat", },
-            typeof (self::TestFieldOrderings),
-            typeof (self::TestFieldOrderings.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_TestExtremeDefaultValues__Descriptor 
         = Descriptor.MessageTypes[18];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_TestExtremeDefaultValues__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_TestExtremeDefaultValues__Descriptor,
             new string[] { "EscapedBytes", "LargeUint32", "LargeUint64", "SmallInt32", "SmallInt64", "Utf8String", },
-            typeof (self::TestExtremeDefaultValues),
-            typeof (self::TestExtremeDefaultValues.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues),
+            typeof (global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_FooRequest__Descriptor 
         = Descriptor.MessageTypes[19];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_FooRequest__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_FooRequest__Descriptor,
             new string[] { },
-            typeof (self::FooRequest),
-            typeof (self::FooRequest.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.FooRequest),
+            typeof (global::Google.ProtocolBuffers.TestProtos.FooRequest.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_FooResponse__Descriptor 
         = Descriptor.MessageTypes[20];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_FooResponse__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_FooResponse__Descriptor,
             new string[] { },
-            typeof (self::FooResponse),
-            typeof (self::FooResponse.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.FooResponse),
+            typeof (global::Google.ProtocolBuffers.TestProtos.FooResponse.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_BarRequest__Descriptor 
         = Descriptor.MessageTypes[21];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_BarRequest__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_BarRequest__Descriptor,
             new string[] { },
-            typeof (self::BarRequest),
-            typeof (self::BarRequest.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.BarRequest),
+            typeof (global::Google.ProtocolBuffers.TestProtos.BarRequest.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_protobuf_unittest_BarResponse__Descriptor 
         = Descriptor.MessageTypes[22];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_BarResponse__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_BarResponse__Descriptor,
             new string[] { },
-            typeof (self::BarResponse),
-            typeof (self::BarResponse.Builder));
+            typeof (global::Google.ProtocolBuffers.TestProtos.BarResponse),
+            typeof (global::Google.ProtocolBuffers.TestProtos.BarResponse.Builder));
     #endregion
     
   }
@@ -1043,11 +1041,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes__FieldAccessorTable; }
     }
     
     #region Nested types
@@ -1069,11 +1067,11 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         
         public static pbd::MessageDescriptor Descriptor {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_NestedMessage__Descriptor; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_NestedMessage__Descriptor; }
         }
         
         protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_NestedMessage__FieldAccessorTable; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_NestedMessage__FieldAccessorTable; }
         }
         
         // optional int32 bb = 1;
@@ -1115,35 +1113,35 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
         }
         
-        public static self::TestAllTypes.Types.NestedMessage ParseFrom(pb::ByteString data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ParseFrom(pb::ByteString data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.NestedMessage ParseFrom(pb::ByteString data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ParseFrom(pb::ByteString data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestAllTypes.Types.NestedMessage ParseFrom(byte[] data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ParseFrom(byte[] data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.NestedMessage ParseFrom(byte[] data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ParseFrom(byte[] data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestAllTypes.Types.NestedMessage ParseFrom(global::System.IO.Stream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ParseFrom(global::System.IO.Stream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.NestedMessage ParseFrom(
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ParseFrom(
             global::System.IO.Stream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestAllTypes.Types.NestedMessage ParseFrom(pb::CodedInputStream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ParseFrom(pb::CodedInputStream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.NestedMessage ParseFrom(pb::CodedInputStream input,
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ParseFrom(pb::CodedInputStream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
@@ -1151,26 +1149,26 @@ namespace Google.ProtocolBuffers.TestProtos {
         
         public static Builder CreateBuilder() { return new Builder(); }
         public override Builder CreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder(self::TestAllTypes.Types.NestedMessage prototype) {
+        public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage prototype) {
           return (Builder) new Builder().MergeFrom(prototype);
         }
         
-        public sealed partial class Builder : pb::GeneratedBuilder<self::TestAllTypes.Types.NestedMessage, Builder> {
+        public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage, Builder> {
           protected override Builder ThisBuilder {
             get { return this; }
           }
           
-          // Construct using self::TestAllTypes.Types.NestedMessage.CreateBuilder()
+          // Construct using global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder()
           internal Builder() {}
           
-          self::TestAllTypes.Types.NestedMessage result = new self::TestAllTypes.Types.NestedMessage();
+          global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage result = new global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage();
           
-          protected override self::TestAllTypes.Types.NestedMessage MessageBeingBuilt {
+          protected override global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage MessageBeingBuilt {
             get { return result; }
           }
           
           public override Builder Clear() {
-            result = new self::TestAllTypes.Types.NestedMessage();
+            result = new global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage();
             return this;
           }
           
@@ -1179,30 +1177,30 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return self::TestAllTypes.Types.NestedMessage.Descriptor; }
+            get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Descriptor; }
           }
           
-          public override self::TestAllTypes.Types.NestedMessage DefaultInstanceForType {
-            get { return self::TestAllTypes.Types.NestedMessage.DefaultInstance; }
+          public override global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage DefaultInstanceForType {
+            get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance; }
           }
           
-          public override self::TestAllTypes.Types.NestedMessage BuildPartial() {
-            self::TestAllTypes.Types.NestedMessage returnMe = result;
+          public override global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage BuildPartial() {
+            global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage returnMe = result;
             result = null;
             return returnMe;
           }
           
           public override Builder MergeFrom(pb::IMessage other) {
-            if (other is self::TestAllTypes.Types.NestedMessage) {
-              return MergeFrom((self::TestAllTypes.Types.NestedMessage) other);
+            if (other is global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage) {
+              return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage) other);
             } else {
               base.MergeFrom(other);
               return this;
             }
           }
           
-          public override Builder MergeFrom(self::TestAllTypes.Types.NestedMessage other) {
-            if (other == self::TestAllTypes.Types.NestedMessage.DefaultInstance) return this;
+          public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage other) {
+            if (other == global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance) return this;
             if (other.HasBb) {
               Bb = other.Bb;
             }
@@ -1272,11 +1270,11 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         
         public static pbd::MessageDescriptor Descriptor {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_OptionalGroup__Descriptor; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_OptionalGroup__Descriptor; }
         }
         
         protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_OptionalGroup__FieldAccessorTable; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_OptionalGroup__FieldAccessorTable; }
         }
         
         // optional int32 a = 17;
@@ -1318,35 +1316,35 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
         }
         
-        public static self::TestAllTypes.Types.OptionalGroup ParseFrom(pb::ByteString data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup ParseFrom(pb::ByteString data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.OptionalGroup ParseFrom(pb::ByteString data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup ParseFrom(pb::ByteString data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestAllTypes.Types.OptionalGroup ParseFrom(byte[] data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup ParseFrom(byte[] data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.OptionalGroup ParseFrom(byte[] data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup ParseFrom(byte[] data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestAllTypes.Types.OptionalGroup ParseFrom(global::System.IO.Stream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup ParseFrom(global::System.IO.Stream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.OptionalGroup ParseFrom(
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup ParseFrom(
             global::System.IO.Stream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestAllTypes.Types.OptionalGroup ParseFrom(pb::CodedInputStream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup ParseFrom(pb::CodedInputStream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.OptionalGroup ParseFrom(pb::CodedInputStream input,
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup ParseFrom(pb::CodedInputStream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
@@ -1354,26 +1352,26 @@ namespace Google.ProtocolBuffers.TestProtos {
         
         public static Builder CreateBuilder() { return new Builder(); }
         public override Builder CreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder(self::TestAllTypes.Types.OptionalGroup prototype) {
+        public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup prototype) {
           return (Builder) new Builder().MergeFrom(prototype);
         }
         
-        public sealed partial class Builder : pb::GeneratedBuilder<self::TestAllTypes.Types.OptionalGroup, Builder> {
+        public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup, Builder> {
           protected override Builder ThisBuilder {
             get { return this; }
           }
           
-          // Construct using self::TestAllTypes.Types.OptionalGroup.CreateBuilder()
+          // Construct using global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.CreateBuilder()
           internal Builder() {}
           
-          self::TestAllTypes.Types.OptionalGroup result = new self::TestAllTypes.Types.OptionalGroup();
+          global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup result = new global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup();
           
-          protected override self::TestAllTypes.Types.OptionalGroup MessageBeingBuilt {
+          protected override global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup MessageBeingBuilt {
             get { return result; }
           }
           
           public override Builder Clear() {
-            result = new self::TestAllTypes.Types.OptionalGroup();
+            result = new global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup();
             return this;
           }
           
@@ -1382,30 +1380,30 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return self::TestAllTypes.Types.OptionalGroup.Descriptor; }
+            get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.Descriptor; }
           }
           
-          public override self::TestAllTypes.Types.OptionalGroup DefaultInstanceForType {
-            get { return self::TestAllTypes.Types.OptionalGroup.DefaultInstance; }
+          public override global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup DefaultInstanceForType {
+            get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.DefaultInstance; }
           }
           
-          public override self::TestAllTypes.Types.OptionalGroup BuildPartial() {
-            self::TestAllTypes.Types.OptionalGroup returnMe = result;
+          public override global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup BuildPartial() {
+            global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup returnMe = result;
             result = null;
             return returnMe;
           }
           
           public override Builder MergeFrom(pb::IMessage other) {
-            if (other is self::TestAllTypes.Types.OptionalGroup) {
-              return MergeFrom((self::TestAllTypes.Types.OptionalGroup) other);
+            if (other is global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup) {
+              return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup) other);
             } else {
               base.MergeFrom(other);
               return this;
             }
           }
           
-          public override Builder MergeFrom(self::TestAllTypes.Types.OptionalGroup other) {
-            if (other == self::TestAllTypes.Types.OptionalGroup.DefaultInstance) return this;
+          public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup other) {
+            if (other == global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.DefaultInstance) return this;
             if (other.HasA) {
               A = other.A;
             }
@@ -1475,11 +1473,11 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         
         public static pbd::MessageDescriptor Descriptor {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_RepeatedGroup__Descriptor; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_RepeatedGroup__Descriptor; }
         }
         
         protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_RepeatedGroup__FieldAccessorTable; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllTypes_RepeatedGroup__FieldAccessorTable; }
         }
         
         // optional int32 a = 47;
@@ -1521,35 +1519,35 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
         }
         
-        public static self::TestAllTypes.Types.RepeatedGroup ParseFrom(pb::ByteString data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup ParseFrom(pb::ByteString data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.RepeatedGroup ParseFrom(pb::ByteString data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup ParseFrom(pb::ByteString data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestAllTypes.Types.RepeatedGroup ParseFrom(byte[] data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup ParseFrom(byte[] data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.RepeatedGroup ParseFrom(byte[] data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup ParseFrom(byte[] data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestAllTypes.Types.RepeatedGroup ParseFrom(global::System.IO.Stream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup ParseFrom(global::System.IO.Stream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.RepeatedGroup ParseFrom(
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup ParseFrom(
             global::System.IO.Stream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestAllTypes.Types.RepeatedGroup ParseFrom(pb::CodedInputStream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup ParseFrom(pb::CodedInputStream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestAllTypes.Types.RepeatedGroup ParseFrom(pb::CodedInputStream input,
+        public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup ParseFrom(pb::CodedInputStream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
@@ -1557,26 +1555,26 @@ namespace Google.ProtocolBuffers.TestProtos {
         
         public static Builder CreateBuilder() { return new Builder(); }
         public override Builder CreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder(self::TestAllTypes.Types.RepeatedGroup prototype) {
+        public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup prototype) {
           return (Builder) new Builder().MergeFrom(prototype);
         }
         
-        public sealed partial class Builder : pb::GeneratedBuilder<self::TestAllTypes.Types.RepeatedGroup, Builder> {
+        public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup, Builder> {
           protected override Builder ThisBuilder {
             get { return this; }
           }
           
-          // Construct using self::TestAllTypes.Types.RepeatedGroup.CreateBuilder()
+          // Construct using global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup.CreateBuilder()
           internal Builder() {}
           
-          self::TestAllTypes.Types.RepeatedGroup result = new self::TestAllTypes.Types.RepeatedGroup();
+          global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup result = new global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup();
           
-          protected override self::TestAllTypes.Types.RepeatedGroup MessageBeingBuilt {
+          protected override global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup MessageBeingBuilt {
             get { return result; }
           }
           
           public override Builder Clear() {
-            result = new self::TestAllTypes.Types.RepeatedGroup();
+            result = new global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup();
             return this;
           }
           
@@ -1585,30 +1583,30 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return self::TestAllTypes.Types.RepeatedGroup.Descriptor; }
+            get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup.Descriptor; }
           }
           
-          public override self::TestAllTypes.Types.RepeatedGroup DefaultInstanceForType {
-            get { return self::TestAllTypes.Types.RepeatedGroup.DefaultInstance; }
+          public override global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup DefaultInstanceForType {
+            get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup.DefaultInstance; }
           }
           
-          public override self::TestAllTypes.Types.RepeatedGroup BuildPartial() {
-            self::TestAllTypes.Types.RepeatedGroup returnMe = result;
+          public override global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup BuildPartial() {
+            global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup returnMe = result;
             result = null;
             return returnMe;
           }
           
           public override Builder MergeFrom(pb::IMessage other) {
-            if (other is self::TestAllTypes.Types.RepeatedGroup) {
-              return MergeFrom((self::TestAllTypes.Types.RepeatedGroup) other);
+            if (other is global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup) {
+              return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup) other);
             } else {
               base.MergeFrom(other);
               return this;
             }
           }
           
-          public override Builder MergeFrom(self::TestAllTypes.Types.RepeatedGroup other) {
-            if (other == self::TestAllTypes.Types.RepeatedGroup.DefaultInstance) return this;
+          public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup other) {
+            if (other == global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup.DefaultInstance) return this;
             if (other.HasA) {
               A = other.A;
             }
@@ -1822,67 +1820,67 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     // optional group OptionalGroup = 16 {
     private bool hasOptionalGroup;
-    private self::TestAllTypes.Types.OptionalGroup optionalGroup_ = self::TestAllTypes.Types.OptionalGroup.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup optionalGroup_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.DefaultInstance;
     public bool HasOptionalGroup {
       get { return hasOptionalGroup; }
     }
-    public self::TestAllTypes.Types.OptionalGroup OptionalGroup {
+    public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup OptionalGroup {
       get { return optionalGroup_; }
     }
     
     // optional .protobuf_unittest.TestAllTypes.NestedMessage optional_nested_message = 18;
     private bool hasOptionalNestedMessage;
-    private self::TestAllTypes.Types.NestedMessage optionalNestedMessage_ = self::TestAllTypes.Types.NestedMessage.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage optionalNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance;
     public bool HasOptionalNestedMessage {
       get { return hasOptionalNestedMessage; }
     }
-    public self::TestAllTypes.Types.NestedMessage OptionalNestedMessage {
+    public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage OptionalNestedMessage {
       get { return optionalNestedMessage_; }
     }
     
     // optional .protobuf_unittest.ForeignMessage optional_foreign_message = 19;
     private bool hasOptionalForeignMessage;
-    private self::ForeignMessage optionalForeignMessage_ = self::ForeignMessage.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.ForeignMessage optionalForeignMessage_ = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance;
     public bool HasOptionalForeignMessage {
       get { return hasOptionalForeignMessage; }
     }
-    public self::ForeignMessage OptionalForeignMessage {
+    public global::Google.ProtocolBuffers.TestProtos.ForeignMessage OptionalForeignMessage {
       get { return optionalForeignMessage_; }
     }
     
     // optional .protobuf_unittest_import.ImportMessage optional_import_message = 20;
     private bool hasOptionalImportMessage;
-    private self::ImportMessage optionalImportMessage_ = self::ImportMessage.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.ImportMessage optionalImportMessage_ = global::Google.ProtocolBuffers.TestProtos.ImportMessage.DefaultInstance;
     public bool HasOptionalImportMessage {
       get { return hasOptionalImportMessage; }
     }
-    public self::ImportMessage OptionalImportMessage {
+    public global::Google.ProtocolBuffers.TestProtos.ImportMessage OptionalImportMessage {
       get { return optionalImportMessage_; }
     }
     
     // optional .protobuf_unittest.TestAllTypes.NestedEnum optional_nested_enum = 21;
     private bool hasOptionalNestedEnum;
-    private self::TestAllTypes.Types.NestedEnum optionalNestedEnum_ = self::TestAllTypes.Types.NestedEnum.FOO;
+    private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum.FOO;
     public bool HasOptionalNestedEnum {
       get { return hasOptionalNestedEnum; }
     }
-    public self::TestAllTypes.Types.NestedEnum OptionalNestedEnum {  get { return optionalNestedEnum_; }}
+    public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum OptionalNestedEnum {  get { return optionalNestedEnum_; }}
     
     // optional .protobuf_unittest.ForeignEnum optional_foreign_enum = 22;
     private bool hasOptionalForeignEnum;
-    private self::ForeignEnum optionalForeignEnum_ = self::ForeignEnum.FOREIGN_FOO;
+    private global::Google.ProtocolBuffers.TestProtos.ForeignEnum optionalForeignEnum_ = global::Google.ProtocolBuffers.TestProtos.ForeignEnum.FOREIGN_FOO;
     public bool HasOptionalForeignEnum {
       get { return hasOptionalForeignEnum; }
     }
-    public self::ForeignEnum OptionalForeignEnum {  get { return optionalForeignEnum_; }}
+    public global::Google.ProtocolBuffers.TestProtos.ForeignEnum OptionalForeignEnum {  get { return optionalForeignEnum_; }}
     
     // optional .protobuf_unittest_import.ImportEnum optional_import_enum = 23;
     private bool hasOptionalImportEnum;
-    private self::ImportEnum optionalImportEnum_ = self::ImportEnum.IMPORT_FOO;
+    private global::Google.ProtocolBuffers.TestProtos.ImportEnum optionalImportEnum_ = global::Google.ProtocolBuffers.TestProtos.ImportEnum.IMPORT_FOO;
     public bool HasOptionalImportEnum {
       get { return hasOptionalImportEnum; }
     }
-    public self::ImportEnum OptionalImportEnum {  get { return optionalImportEnum_; }}
+    public global::Google.ProtocolBuffers.TestProtos.ImportEnum OptionalImportEnum {  get { return optionalImportEnum_; }}
     
     // optional string optional_string_piece = 24 [ctype = STRING_PIECE];
     private bool hasOptionalStringPiece;
@@ -2085,86 +2083,86 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     // repeated group RepeatedGroup = 46 {
-    private scg::IList<self::TestAllTypes.Types.RepeatedGroup> repeatedGroup_ = pbc::Lists<self::TestAllTypes.Types.RepeatedGroup>.Empty;
-    public scg::IList<self::TestAllTypes.Types.RepeatedGroup> RepeatedGroupList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup> repeatedGroup_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup> RepeatedGroupList {
       get { return repeatedGroup_; } 
     }
     public int RepeatedGroupCount
       { get { return repeatedGroup_.Count; }
     }
-    public self::TestAllTypes.Types.RepeatedGroup GetRepeatedGroup(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup GetRepeatedGroup(int index) {
       return repeatedGroup_ [index];
     }
     
     // repeated .protobuf_unittest.TestAllTypes.NestedMessage repeated_nested_message = 48;
-    private scg::IList<self::TestAllTypes.Types.NestedMessage> repeatedNestedMessage_ = pbc::Lists<self::TestAllTypes.Types.NestedMessage>.Empty;
-    public scg::IList<self::TestAllTypes.Types.NestedMessage> RepeatedNestedMessageList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage> repeatedNestedMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage> RepeatedNestedMessageList {
       get { return repeatedNestedMessage_; } 
     }
     public int RepeatedNestedMessageCount
       { get { return repeatedNestedMessage_.Count; }
     }
-    public self::TestAllTypes.Types.NestedMessage GetRepeatedNestedMessage(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage GetRepeatedNestedMessage(int index) {
       return repeatedNestedMessage_ [index];
     }
     
     // repeated .protobuf_unittest.ForeignMessage repeated_foreign_message = 49;
-    private scg::IList<self::ForeignMessage> repeatedForeignMessage_ = pbc::Lists<self::ForeignMessage>.Empty;
-    public scg::IList<self::ForeignMessage> RepeatedForeignMessageList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> repeatedForeignMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedForeignMessageList {
       get { return repeatedForeignMessage_; } 
     }
     public int RepeatedForeignMessageCount
       { get { return repeatedForeignMessage_.Count; }
     }
-    public self::ForeignMessage GetRepeatedForeignMessage(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.ForeignMessage GetRepeatedForeignMessage(int index) {
       return repeatedForeignMessage_ [index];
     }
     
     // repeated .protobuf_unittest_import.ImportMessage repeated_import_message = 50;
-    private scg::IList<self::ImportMessage> repeatedImportMessage_ = pbc::Lists<self::ImportMessage>.Empty;
-    public scg::IList<self::ImportMessage> RepeatedImportMessageList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportMessage> repeatedImportMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ImportMessage>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportMessage> RepeatedImportMessageList {
       get { return repeatedImportMessage_; } 
     }
     public int RepeatedImportMessageCount
       { get { return repeatedImportMessage_.Count; }
     }
-    public self::ImportMessage GetRepeatedImportMessage(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.ImportMessage GetRepeatedImportMessage(int index) {
       return repeatedImportMessage_ [index];
     }
     
     // repeated .protobuf_unittest.TestAllTypes.NestedEnum repeated_nested_enum = 51;
-    private scg::IList<self::TestAllTypes.Types.NestedEnum> repeatedNestedEnum_ = new scg::List<self::TestAllTypes.Types.NestedEnum> ();
-    public scg.IList<self::TestAllTypes.Types.NestedEnum> RepeatedNestedEnumList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum> repeatedNestedEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum> ();
+    public scg.IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum> RepeatedNestedEnumList {
       get { return pbc::Lists.AsReadOnly(repeatedNestedEnum_); }
     }
     public int RepeatedNestedEnumCount {
       get { return repeatedNestedEnum_.Count; }
     }
-    public self::TestAllTypes.Types.NestedEnum GetRepeatedNestedEnum(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum GetRepeatedNestedEnum(int index) {
       return repeatedNestedEnum_[index];
     }
     
     // repeated .protobuf_unittest.ForeignEnum repeated_foreign_enum = 52;
-    private scg::IList<self::ForeignEnum> repeatedForeignEnum_ = new scg::List<self::ForeignEnum> ();
-    public scg.IList<self::ForeignEnum> RepeatedForeignEnumList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> repeatedForeignEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> ();
+    public scg.IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedForeignEnumList {
       get { return pbc::Lists.AsReadOnly(repeatedForeignEnum_); }
     }
     public int RepeatedForeignEnumCount {
       get { return repeatedForeignEnum_.Count; }
     }
-    public self::ForeignEnum GetRepeatedForeignEnum(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.ForeignEnum GetRepeatedForeignEnum(int index) {
       return repeatedForeignEnum_[index];
     }
     
     // repeated .protobuf_unittest_import.ImportEnum repeated_import_enum = 53;
-    private scg::IList<self::ImportEnum> repeatedImportEnum_ = new scg::List<self::ImportEnum> ();
-    public scg.IList<self::ImportEnum> RepeatedImportEnumList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportEnum> repeatedImportEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ImportEnum> ();
+    public scg.IList<global::Google.ProtocolBuffers.TestProtos.ImportEnum> RepeatedImportEnumList {
       get { return pbc::Lists.AsReadOnly(repeatedImportEnum_); }
     }
     public int RepeatedImportEnumCount {
       get { return repeatedImportEnum_.Count; }
     }
-    public self::ImportEnum GetRepeatedImportEnum(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.ImportEnum GetRepeatedImportEnum(int index) {
       return repeatedImportEnum_[index];
     }
     
@@ -2334,7 +2332,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     // optional bytes default_bytes = 75 [default = "world"];
     private bool hasDefaultBytes;
-    private pb::ByteString defaultBytes_ = ((pb::ByteString) self::TestAllTypes.Descriptor.Fields[62].DefaultValue);
+    private pb::ByteString defaultBytes_ = ((pb::ByteString) global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Descriptor.Fields[62].DefaultValue);
     public bool HasDefaultBytes {
       get { return hasDefaultBytes; }
     }
@@ -2344,27 +2342,27 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     // optional .protobuf_unittest.TestAllTypes.NestedEnum default_nested_enum = 81 [default = BAR];
     private bool hasDefaultNestedEnum;
-    private self::TestAllTypes.Types.NestedEnum defaultNestedEnum_ = self::TestAllTypes.Types.NestedEnum.BAR;
+    private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum defaultNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum.BAR;
     public bool HasDefaultNestedEnum {
       get { return hasDefaultNestedEnum; }
     }
-    public self::TestAllTypes.Types.NestedEnum DefaultNestedEnum {  get { return defaultNestedEnum_; }}
+    public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum DefaultNestedEnum {  get { return defaultNestedEnum_; }}
     
     // optional .protobuf_unittest.ForeignEnum default_foreign_enum = 82 [default = FOREIGN_BAR];
     private bool hasDefaultForeignEnum;
-    private self::ForeignEnum defaultForeignEnum_ = self::ForeignEnum.FOREIGN_BAR;
+    private global::Google.ProtocolBuffers.TestProtos.ForeignEnum defaultForeignEnum_ = global::Google.ProtocolBuffers.TestProtos.ForeignEnum.FOREIGN_BAR;
     public bool HasDefaultForeignEnum {
       get { return hasDefaultForeignEnum; }
     }
-    public self::ForeignEnum DefaultForeignEnum {  get { return defaultForeignEnum_; }}
+    public global::Google.ProtocolBuffers.TestProtos.ForeignEnum DefaultForeignEnum {  get { return defaultForeignEnum_; }}
     
     // optional .protobuf_unittest_import.ImportEnum default_import_enum = 83 [default = IMPORT_BAR];
     private bool hasDefaultImportEnum;
-    private self::ImportEnum defaultImportEnum_ = self::ImportEnum.IMPORT_BAR;
+    private global::Google.ProtocolBuffers.TestProtos.ImportEnum defaultImportEnum_ = global::Google.ProtocolBuffers.TestProtos.ImportEnum.IMPORT_BAR;
     public bool HasDefaultImportEnum {
       get { return hasDefaultImportEnum; }
     }
-    public self::ImportEnum DefaultImportEnum {  get { return defaultImportEnum_; }}
+    public global::Google.ProtocolBuffers.TestProtos.ImportEnum DefaultImportEnum {  get { return defaultImportEnum_; }}
     
     // optional string default_string_piece = 84 [default = "abc", ctype = STRING_PIECE];
     private bool hasDefaultStringPiece;
@@ -2510,25 +2508,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       foreach (pb::ByteString element in RepeatedBytesList) {
         output.WriteBytes(45, element);
       }
-      foreach (self::TestAllTypes.Types.RepeatedGroup element in RepeatedGroupList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup element in RepeatedGroupList) {
         output.WriteGroup(46, element);
       }
-      foreach (self::TestAllTypes.Types.NestedMessage element in RepeatedNestedMessageList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage element in RepeatedNestedMessageList) {
         output.WriteMessage(48, element);
       }
-      foreach (self::ForeignMessage element in RepeatedForeignMessageList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.ForeignMessage element in RepeatedForeignMessageList) {
         output.WriteMessage(49, element);
       }
-      foreach (self::ImportMessage element in RepeatedImportMessageList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.ImportMessage element in RepeatedImportMessageList) {
         output.WriteMessage(50, element);
       }
-      foreach (self::TestAllTypes.Types.NestedEnum element in RepeatedNestedEnumList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum element in RepeatedNestedEnumList) {
         output.WriteEnum(51, (int) element);
       }
-      foreach (self::ForeignEnum element in RepeatedForeignEnumList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.ForeignEnum element in RepeatedForeignEnumList) {
         output.WriteEnum(52, (int) element);
       }
-      foreach (self::ImportEnum element in RepeatedImportEnumList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.ImportEnum element in RepeatedImportEnumList) {
         output.WriteEnum(53, (int) element);
       }
       foreach (string element in RepeatedStringPieceList) {
@@ -2742,27 +2740,27 @@ namespace Google.ProtocolBuffers.TestProtos {
           size += pb::CodedOutputStream
             .ComputeBytesSize(45, element);
         }
-        foreach (self::TestAllTypes.Types.RepeatedGroup element in RepeatedGroupList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup element in RepeatedGroupList) {
           size += pb::CodedOutputStream.ComputeGroupSize(46, element);
         }
-        foreach (self::TestAllTypes.Types.NestedMessage element in RepeatedNestedMessageList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage element in RepeatedNestedMessageList) {
           size += pb::CodedOutputStream.ComputeMessageSize(48, element);
         }
-        foreach (self::ForeignMessage element in RepeatedForeignMessageList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.ForeignMessage element in RepeatedForeignMessageList) {
           size += pb::CodedOutputStream.ComputeMessageSize(49, element);
         }
-        foreach (self::ImportMessage element in RepeatedImportMessageList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.ImportMessage element in RepeatedImportMessageList) {
           size += pb::CodedOutputStream.ComputeMessageSize(50, element);
         }
-        foreach (self::TestAllTypes.Types.NestedEnum element in RepeatedNestedEnumList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum element in RepeatedNestedEnumList) {
           size += pb::CodedOutputStream
             .ComputeEnumSize(51, (int) element);
         }
-        foreach (self::ForeignEnum element in RepeatedForeignEnumList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.ForeignEnum element in RepeatedForeignEnumList) {
           size += pb::CodedOutputStream
             .ComputeEnumSize(52, (int) element);
         }
-        foreach (self::ImportEnum element in RepeatedImportEnumList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.ImportEnum element in RepeatedImportEnumList) {
           size += pb::CodedOutputStream
             .ComputeEnumSize(53, (int) element);
         }
@@ -2843,35 +2841,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestAllTypes ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestAllTypes ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestAllTypes ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestAllTypes ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestAllTypes ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestAllTypes ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestAllTypes ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestAllTypes ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllTypes ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -2879,26 +2877,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestAllTypes prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestAllTypes prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestAllTypes, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestAllTypes, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestAllTypes.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestAllTypes.CreateBuilder()
       internal Builder() {}
       
-      self::TestAllTypes result = new self::TestAllTypes();
+      global::Google.ProtocolBuffers.TestProtos.TestAllTypes result = new global::Google.ProtocolBuffers.TestProtos.TestAllTypes();
       
-      protected override self::TestAllTypes MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestAllTypes MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestAllTypes();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestAllTypes();
         return this;
       }
       
@@ -2907,14 +2905,14 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestAllTypes.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Descriptor; }
       }
       
-      public override self::TestAllTypes DefaultInstanceForType {
-        get { return self::TestAllTypes.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestAllTypes DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance; }
       }
       
-      public override self::TestAllTypes BuildPartial() {
+      public override global::Google.ProtocolBuffers.TestProtos.TestAllTypes BuildPartial() {
         result.repeatedInt32_ = pbc::Lists<int>.AsReadOnly(result.repeatedInt32_);
         result.repeatedInt64_ = pbc::Lists<long>.AsReadOnly(result.repeatedInt64_);
         result.repeatedUint32_ = pbc::Lists<uint>.AsReadOnly(result.repeatedUint32_);
@@ -2930,39 +2928,39 @@ namespace Google.ProtocolBuffers.TestProtos {
         result.repeatedBool_ = pbc::Lists<bool>.AsReadOnly(result.repeatedBool_);
         result.repeatedString_ = pbc::Lists<string>.AsReadOnly(result.repeatedString_);
         result.repeatedBytes_ = pbc::Lists<pb::ByteString>.AsReadOnly(result.repeatedBytes_);
-        if (result.repeatedGroup_ != pbc::Lists<self::TestAllTypes.Types.RepeatedGroup>.Empty) {
-          result.repeatedGroup_ = pbc::Lists<self::TestAllTypes.Types.RepeatedGroup>.AsReadOnly(result.repeatedGroup_);
+        if (result.repeatedGroup_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>.Empty) {
+          result.repeatedGroup_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>.AsReadOnly(result.repeatedGroup_);
         }
-        if (result.repeatedNestedMessage_ != pbc::Lists<self::TestAllTypes.Types.NestedMessage>.Empty) {
-          result.repeatedNestedMessage_ = pbc::Lists<self::TestAllTypes.Types.NestedMessage>.AsReadOnly(result.repeatedNestedMessage_);
+        if (result.repeatedNestedMessage_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>.Empty) {
+          result.repeatedNestedMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>.AsReadOnly(result.repeatedNestedMessage_);
         }
-        if (result.repeatedForeignMessage_ != pbc::Lists<self::ForeignMessage>.Empty) {
-          result.repeatedForeignMessage_ = pbc::Lists<self::ForeignMessage>.AsReadOnly(result.repeatedForeignMessage_);
+        if (result.repeatedForeignMessage_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+          result.repeatedForeignMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.AsReadOnly(result.repeatedForeignMessage_);
         }
-        if (result.repeatedImportMessage_ != pbc::Lists<self::ImportMessage>.Empty) {
-          result.repeatedImportMessage_ = pbc::Lists<self::ImportMessage>.AsReadOnly(result.repeatedImportMessage_);
+        if (result.repeatedImportMessage_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ImportMessage>.Empty) {
+          result.repeatedImportMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ImportMessage>.AsReadOnly(result.repeatedImportMessage_);
         }
         result.repeatedNestedEnum_ = pbc::Lists.AsReadOnly(result.repeatedNestedEnum_);
         result.repeatedForeignEnum_ = pbc::Lists.AsReadOnly(result.repeatedForeignEnum_);
         result.repeatedImportEnum_ = pbc::Lists.AsReadOnly(result.repeatedImportEnum_);
         result.repeatedStringPiece_ = pbc::Lists<string>.AsReadOnly(result.repeatedStringPiece_);
         result.repeatedCord_ = pbc::Lists<string>.AsReadOnly(result.repeatedCord_);
-        self::TestAllTypes returnMe = result;
+        global::Google.ProtocolBuffers.TestProtos.TestAllTypes returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestAllTypes) {
-          return MergeFrom((self::TestAllTypes) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestAllTypes) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestAllTypes) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestAllTypes other) {
-        if (other == self::TestAllTypes.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestAllTypes other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance) return this;
         if (other.HasOptionalInt32) {
           OptionalInt32 = other.OptionalInt32;
         }
@@ -3127,43 +3125,43 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         if (other.repeatedGroup_.Count != 0) {
           if (result.repeatedGroup_.Count == 0) {
-            result.repeatedGroup_ = new scg::List<self::TestAllTypes.Types.RepeatedGroup>();
+            result.repeatedGroup_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>();
           }
           base.AddRange(other.repeatedGroup_, result.repeatedGroup_);
         }
         if (other.repeatedNestedMessage_.Count != 0) {
           if (result.repeatedNestedMessage_.Count == 0) {
-            result.repeatedNestedMessage_ = new scg::List<self::TestAllTypes.Types.NestedMessage>();
+            result.repeatedNestedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>();
           }
           base.AddRange(other.repeatedNestedMessage_, result.repeatedNestedMessage_);
         }
         if (other.repeatedForeignMessage_.Count != 0) {
           if (result.repeatedForeignMessage_.Count == 0) {
-            result.repeatedForeignMessage_ = new scg::List<self::ForeignMessage>();
+            result.repeatedForeignMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
           }
           base.AddRange(other.repeatedForeignMessage_, result.repeatedForeignMessage_);
         }
         if (other.repeatedImportMessage_.Count != 0) {
           if (result.repeatedImportMessage_.Count == 0) {
-            result.repeatedImportMessage_ = new scg::List<self::ImportMessage>();
+            result.repeatedImportMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ImportMessage>();
           }
           base.AddRange(other.repeatedImportMessage_, result.repeatedImportMessage_);
         }
         if (other.repeatedNestedEnum_.Count != 0) {
           if (result.repeatedNestedEnum_.Count == 0) {
-            result.repeatedNestedEnum_ = new scg::List<self::TestAllTypes.Types.NestedEnum>();
+            result.repeatedNestedEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum>();
           }
           base.AddRange(other.repeatedNestedEnum_, result.repeatedNestedEnum_);
         }
         if (other.repeatedForeignEnum_.Count != 0) {
           if (result.repeatedForeignEnum_.Count == 0) {
-            result.repeatedForeignEnum_ = new scg::List<self::ForeignEnum>();
+            result.repeatedForeignEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>();
           }
           base.AddRange(other.repeatedForeignEnum_, result.repeatedForeignEnum_);
         }
         if (other.repeatedImportEnum_.Count != 0) {
           if (result.repeatedImportEnum_.Count == 0) {
-            result.repeatedImportEnum_ = new scg::List<self::ImportEnum>();
+            result.repeatedImportEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ImportEnum>();
           }
           base.AddRange(other.repeatedImportEnum_, result.repeatedImportEnum_);
         }
@@ -3325,7 +3323,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 131: {
-              self::TestAllTypes.Types.OptionalGroup.Builder subBuilder = self::TestAllTypes.Types.OptionalGroup.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.CreateBuilder();
               if (HasOptionalGroup) {
                 subBuilder.MergeFrom(OptionalGroup);
               }
@@ -3334,7 +3332,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 146: {
-              self::TestAllTypes.Types.NestedMessage.Builder subBuilder = self::TestAllTypes.Types.NestedMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder();
               if (HasOptionalNestedMessage) {
                 subBuilder.MergeFrom(OptionalNestedMessage);
               }
@@ -3343,7 +3341,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 154: {
-              self::ForeignMessage.Builder subBuilder = self::ForeignMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder();
               if (HasOptionalForeignMessage) {
                 subBuilder.MergeFrom(OptionalForeignMessage);
               }
@@ -3352,7 +3350,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 162: {
-              self::ImportMessage.Builder subBuilder = self::ImportMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.ImportMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.ImportMessage.CreateBuilder();
               if (HasOptionalImportMessage) {
                 subBuilder.MergeFrom(OptionalImportMessage);
               }
@@ -3362,28 +3360,28 @@ namespace Google.ProtocolBuffers.TestProtos {
             }
             case 168: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::TestAllTypes.Types.NestedEnum), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum), rawValue)) {
                 unknownFields.MergeVarintField(21, (ulong) rawValue);
               } else {
-                OptionalNestedEnum = (self::TestAllTypes.Types.NestedEnum) rawValue;
+                OptionalNestedEnum = (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum) rawValue;
               }
               break;
             }
             case 176: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::ForeignEnum), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.ForeignEnum), rawValue)) {
                 unknownFields.MergeVarintField(22, (ulong) rawValue);
               } else {
-                OptionalForeignEnum = (self::ForeignEnum) rawValue;
+                OptionalForeignEnum = (global::Google.ProtocolBuffers.TestProtos.ForeignEnum) rawValue;
               }
               break;
             }
             case 184: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::ImportEnum), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.ImportEnum), rawValue)) {
                 unknownFields.MergeVarintField(23, (ulong) rawValue);
               } else {
-                OptionalImportEnum = (self::ImportEnum) rawValue;
+                OptionalImportEnum = (global::Google.ProtocolBuffers.TestProtos.ImportEnum) rawValue;
               }
               break;
             }
@@ -3456,33 +3454,33 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 371: {
-              self::TestAllTypes.Types.RepeatedGroup.Builder subBuilder = self::TestAllTypes.Types.RepeatedGroup.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup.CreateBuilder();
               input.ReadGroup(46, subBuilder, extensionRegistry);
               AddRepeatedGroup(subBuilder.BuildPartial());
               break;
             }
             case 386: {
-              self::TestAllTypes.Types.NestedMessage.Builder subBuilder = self::TestAllTypes.Types.NestedMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddRepeatedNestedMessage(subBuilder.BuildPartial());
               break;
             }
             case 394: {
-              self::ForeignMessage.Builder subBuilder = self::ForeignMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddRepeatedForeignMessage(subBuilder.BuildPartial());
               break;
             }
             case 402: {
-              self::ImportMessage.Builder subBuilder = self::ImportMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.ImportMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.ImportMessage.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddRepeatedImportMessage(subBuilder.BuildPartial());
               break;
             }
             case 408: {
               int rawValue = input.ReadEnum();
-              self::TestAllTypes.Types.NestedEnum value = (self::TestAllTypes.Types.NestedEnum) rawValue;
-              if (!global::System.Enum.IsDefined(typeof(self::TestAllTypes.Types.NestedEnum), value)) {
+              global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum value = (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum) rawValue;
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum), value)) {
                 unknownFields.MergeVarintField(51, (ulong) rawValue);
               } else {
                 AddRepeatedNestedEnum(value);
@@ -3491,8 +3489,8 @@ namespace Google.ProtocolBuffers.TestProtos {
             }
             case 416: {
               int rawValue = input.ReadEnum();
-              self::ForeignEnum value = (self::ForeignEnum) rawValue;
-              if (!global::System.Enum.IsDefined(typeof(self::ForeignEnum), value)) {
+              global::Google.ProtocolBuffers.TestProtos.ForeignEnum value = (global::Google.ProtocolBuffers.TestProtos.ForeignEnum) rawValue;
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.ForeignEnum), value)) {
                 unknownFields.MergeVarintField(52, (ulong) rawValue);
               } else {
                 AddRepeatedForeignEnum(value);
@@ -3501,8 +3499,8 @@ namespace Google.ProtocolBuffers.TestProtos {
             }
             case 424: {
               int rawValue = input.ReadEnum();
-              self::ImportEnum value = (self::ImportEnum) rawValue;
-              if (!global::System.Enum.IsDefined(typeof(self::ImportEnum), value)) {
+              global::Google.ProtocolBuffers.TestProtos.ImportEnum value = (global::Google.ProtocolBuffers.TestProtos.ImportEnum) rawValue;
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.ImportEnum), value)) {
                 unknownFields.MergeVarintField(53, (ulong) rawValue);
               } else {
                 AddRepeatedImportEnum(value);
@@ -3579,28 +3577,28 @@ namespace Google.ProtocolBuffers.TestProtos {
             }
             case 648: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::TestAllTypes.Types.NestedEnum), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum), rawValue)) {
                 unknownFields.MergeVarintField(81, (ulong) rawValue);
               } else {
-                DefaultNestedEnum = (self::TestAllTypes.Types.NestedEnum) rawValue;
+                DefaultNestedEnum = (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum) rawValue;
               }
               break;
             }
             case 656: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::ForeignEnum), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.ForeignEnum), rawValue)) {
                 unknownFields.MergeVarintField(82, (ulong) rawValue);
               } else {
-                DefaultForeignEnum = (self::ForeignEnum) rawValue;
+                DefaultForeignEnum = (global::Google.ProtocolBuffers.TestProtos.ForeignEnum) rawValue;
               }
               break;
             }
             case 664: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::ImportEnum), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.ImportEnum), rawValue)) {
                 unknownFields.MergeVarintField(83, (ulong) rawValue);
               } else {
-                DefaultImportEnum = (self::ImportEnum) rawValue;
+                DefaultImportEnum = (global::Google.ProtocolBuffers.TestProtos.ImportEnum) rawValue;
               }
               break;
             }
@@ -3906,25 +3904,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalGroup {
         get { return result.HasOptionalGroup; }
       }
-      public self::TestAllTypes.Types.OptionalGroup OptionalGroup {
+      public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup OptionalGroup {
         get { return result.OptionalGroup; }
         set { SetOptionalGroup(value); }
       }
-      public Builder SetOptionalGroup(self::TestAllTypes.Types.OptionalGroup value) {
+      public Builder SetOptionalGroup(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup value) {
         result.hasOptionalGroup = true;
         result.optionalGroup_ = value;
         return this;
       }
-      public Builder SetOptionalGroup(self::TestAllTypes.Types.OptionalGroup.Builder builderForValue) {
+      public Builder SetOptionalGroup(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.Builder builderForValue) {
         result.hasOptionalGroup = true;
         result.optionalGroup_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptionalGroup(self::TestAllTypes.Types.OptionalGroup value) {
+      public Builder MergeOptionalGroup(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup value) {
         if (result.HasOptionalGroup &&
-            result.optionalGroup_ != self::TestAllTypes.Types.OptionalGroup.DefaultInstance) {
+            result.optionalGroup_ != global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.DefaultInstance) {
           result.optionalGroup_ =
-            self::TestAllTypes.Types.OptionalGroup.CreateBuilder(result.optionalGroup_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.CreateBuilder(result.optionalGroup_).MergeFrom(value).BuildPartial();
         } else {
           result.optionalGroup_ = value;
         }
@@ -3933,7 +3931,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearOptionalGroup() {
         result.hasOptionalGroup = false;
-        result.optionalGroup_ = self::TestAllTypes.Types.OptionalGroup.DefaultInstance;
+        result.optionalGroup_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.OptionalGroup.DefaultInstance;
         return this;
       }
       
@@ -3941,25 +3939,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalNestedMessage {
         get { return result.HasOptionalNestedMessage; }
       }
-      public self::TestAllTypes.Types.NestedMessage OptionalNestedMessage {
+      public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage OptionalNestedMessage {
         get { return result.OptionalNestedMessage; }
         set { SetOptionalNestedMessage(value); }
       }
-      public Builder SetOptionalNestedMessage(self::TestAllTypes.Types.NestedMessage value) {
+      public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) {
         result.hasOptionalNestedMessage = true;
         result.optionalNestedMessage_ = value;
         return this;
       }
-      public Builder SetOptionalNestedMessage(self::TestAllTypes.Types.NestedMessage.Builder builderForValue) {
+      public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) {
         result.hasOptionalNestedMessage = true;
         result.optionalNestedMessage_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptionalNestedMessage(self::TestAllTypes.Types.NestedMessage value) {
+      public Builder MergeOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) {
         if (result.HasOptionalNestedMessage &&
-            result.optionalNestedMessage_ != self::TestAllTypes.Types.NestedMessage.DefaultInstance) {
+            result.optionalNestedMessage_ != global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance) {
           result.optionalNestedMessage_ =
-            self::TestAllTypes.Types.NestedMessage.CreateBuilder(result.optionalNestedMessage_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder(result.optionalNestedMessage_).MergeFrom(value).BuildPartial();
         } else {
           result.optionalNestedMessage_ = value;
         }
@@ -3968,7 +3966,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearOptionalNestedMessage() {
         result.hasOptionalNestedMessage = false;
-        result.optionalNestedMessage_ = self::TestAllTypes.Types.NestedMessage.DefaultInstance;
+        result.optionalNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance;
         return this;
       }
       
@@ -3976,25 +3974,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalForeignMessage {
         get { return result.HasOptionalForeignMessage; }
       }
-      public self::ForeignMessage OptionalForeignMessage {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignMessage OptionalForeignMessage {
         get { return result.OptionalForeignMessage; }
         set { SetOptionalForeignMessage(value); }
       }
-      public Builder SetOptionalForeignMessage(self::ForeignMessage value) {
+      public Builder SetOptionalForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
         result.hasOptionalForeignMessage = true;
         result.optionalForeignMessage_ = value;
         return this;
       }
-      public Builder SetOptionalForeignMessage(self::ForeignMessage.Builder builderForValue) {
+      public Builder SetOptionalForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) {
         result.hasOptionalForeignMessage = true;
         result.optionalForeignMessage_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptionalForeignMessage(self::ForeignMessage value) {
+      public Builder MergeOptionalForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
         if (result.HasOptionalForeignMessage &&
-            result.optionalForeignMessage_ != self::ForeignMessage.DefaultInstance) {
+            result.optionalForeignMessage_ != global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance) {
           result.optionalForeignMessage_ =
-            self::ForeignMessage.CreateBuilder(result.optionalForeignMessage_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder(result.optionalForeignMessage_).MergeFrom(value).BuildPartial();
         } else {
           result.optionalForeignMessage_ = value;
         }
@@ -4003,7 +4001,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearOptionalForeignMessage() {
         result.hasOptionalForeignMessage = false;
-        result.optionalForeignMessage_ = self::ForeignMessage.DefaultInstance;
+        result.optionalForeignMessage_ = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance;
         return this;
       }
       
@@ -4011,25 +4009,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalImportMessage {
         get { return result.HasOptionalImportMessage; }
       }
-      public self::ImportMessage OptionalImportMessage {
+      public global::Google.ProtocolBuffers.TestProtos.ImportMessage OptionalImportMessage {
         get { return result.OptionalImportMessage; }
         set { SetOptionalImportMessage(value); }
       }
-      public Builder SetOptionalImportMessage(self::ImportMessage value) {
+      public Builder SetOptionalImportMessage(global::Google.ProtocolBuffers.TestProtos.ImportMessage value) {
         result.hasOptionalImportMessage = true;
         result.optionalImportMessage_ = value;
         return this;
       }
-      public Builder SetOptionalImportMessage(self::ImportMessage.Builder builderForValue) {
+      public Builder SetOptionalImportMessage(global::Google.ProtocolBuffers.TestProtos.ImportMessage.Builder builderForValue) {
         result.hasOptionalImportMessage = true;
         result.optionalImportMessage_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptionalImportMessage(self::ImportMessage value) {
+      public Builder MergeOptionalImportMessage(global::Google.ProtocolBuffers.TestProtos.ImportMessage value) {
         if (result.HasOptionalImportMessage &&
-            result.optionalImportMessage_ != self::ImportMessage.DefaultInstance) {
+            result.optionalImportMessage_ != global::Google.ProtocolBuffers.TestProtos.ImportMessage.DefaultInstance) {
           result.optionalImportMessage_ =
-            self::ImportMessage.CreateBuilder(result.optionalImportMessage_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.ImportMessage.CreateBuilder(result.optionalImportMessage_).MergeFrom(value).BuildPartial();
         } else {
           result.optionalImportMessage_ = value;
         }
@@ -4038,7 +4036,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearOptionalImportMessage() {
         result.hasOptionalImportMessage = false;
-        result.optionalImportMessage_ = self::ImportMessage.DefaultInstance;
+        result.optionalImportMessage_ = global::Google.ProtocolBuffers.TestProtos.ImportMessage.DefaultInstance;
         return this;
       }
       
@@ -4046,18 +4044,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalNestedEnum {
         get { return result.HasOptionalNestedEnum; }
       }
-      public self::TestAllTypes.Types.NestedEnum OptionalNestedEnum {
+      public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum OptionalNestedEnum {
         get { return result.OptionalNestedEnum; }
         set { SetOptionalNestedEnum(value); }
       }
-      public Builder SetOptionalNestedEnum(self::TestAllTypes.Types.NestedEnum value) {
+      public Builder SetOptionalNestedEnum(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum value) {
         result.hasOptionalNestedEnum = true;
         result.optionalNestedEnum_ = value;
         return this;
       }
       public Builder ClearOptionalNestedEnum() {
         result.hasOptionalNestedEnum = false;
-        result.optionalNestedEnum_ = self::TestAllTypes.Types.NestedEnum.FOO;
+        result.optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum.FOO;
         return this;
       }
       
@@ -4065,18 +4063,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalForeignEnum {
         get { return result.HasOptionalForeignEnum; }
       }
-      public self::ForeignEnum OptionalForeignEnum {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignEnum OptionalForeignEnum {
         get { return result.OptionalForeignEnum; }
         set { SetOptionalForeignEnum(value); }
       }
-      public Builder SetOptionalForeignEnum(self::ForeignEnum value) {
+      public Builder SetOptionalForeignEnum(global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) {
         result.hasOptionalForeignEnum = true;
         result.optionalForeignEnum_ = value;
         return this;
       }
       public Builder ClearOptionalForeignEnum() {
         result.hasOptionalForeignEnum = false;
-        result.optionalForeignEnum_ = self::ForeignEnum.FOREIGN_FOO;
+        result.optionalForeignEnum_ = global::Google.ProtocolBuffers.TestProtos.ForeignEnum.FOREIGN_FOO;
         return this;
       }
       
@@ -4084,18 +4082,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalImportEnum {
         get { return result.HasOptionalImportEnum; }
       }
-      public self::ImportEnum OptionalImportEnum {
+      public global::Google.ProtocolBuffers.TestProtos.ImportEnum OptionalImportEnum {
         get { return result.OptionalImportEnum; }
         set { SetOptionalImportEnum(value); }
       }
-      public Builder SetOptionalImportEnum(self::ImportEnum value) {
+      public Builder SetOptionalImportEnum(global::Google.ProtocolBuffers.TestProtos.ImportEnum value) {
         result.hasOptionalImportEnum = true;
         result.optionalImportEnum_ = value;
         return this;
       }
       public Builder ClearOptionalImportEnum() {
         result.hasOptionalImportEnum = false;
-        result.optionalImportEnum_ = self::ImportEnum.IMPORT_FOO;
+        result.optionalImportEnum_ = global::Google.ProtocolBuffers.TestProtos.ImportEnum.IMPORT_FOO;
         return this;
       }
       
@@ -4633,277 +4631,277 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       // repeated group RepeatedGroup = 46 {
-      public scg::IList<self::TestAllTypes.Types.RepeatedGroup> RepeatedGroupList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup> RepeatedGroupList {
         get { return pbc::Lists.AsReadOnly(result.repeatedGroup_); }
       }
       public int RepeatedGroupCount {
         get { return result.RepeatedGroupCount; }
       }
-      public self::TestAllTypes.Types.RepeatedGroup GetRepeatedGroup(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup GetRepeatedGroup(int index) {
         return result.GetRepeatedGroup(index);
       }
-      public Builder SetRepeatedGroup(int index, self::TestAllTypes.Types.RepeatedGroup value) {
+      public Builder SetRepeatedGroup(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup value) {
         result.repeatedGroup_[index] = value;
         return this;
       }
-      public Builder SetRepeatedGroup(int index, self::TestAllTypes.Types.RepeatedGroup.Builder builderForValue) {
+      public Builder SetRepeatedGroup(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup.Builder builderForValue) {
         result.repeatedGroup_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddRepeatedGroup(self::TestAllTypes.Types.RepeatedGroup value) {
-        if (result.repeatedGroup_ == pbc::Lists<self::TestAllTypes.Types.RepeatedGroup>.Empty) {
-          result.repeatedGroup_ = new scg::List<self::TestAllTypes.Types.RepeatedGroup>();
+      public Builder AddRepeatedGroup(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup value) {
+        if (result.repeatedGroup_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>.Empty) {
+          result.repeatedGroup_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>();
         }
         result.repeatedGroup_.Add(value);
         return this;
       }
-      public Builder AddRepeatedGroup(self::TestAllTypes.Types.RepeatedGroup.Builder builderForValue) {
-        if (result.repeatedGroup_ == pbc::Lists<self::TestAllTypes.Types.RepeatedGroup>.Empty) {
-          result.repeatedGroup_ = new scg::List<self::TestAllTypes.Types.RepeatedGroup>();
+      public Builder AddRepeatedGroup(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup.Builder builderForValue) {
+        if (result.repeatedGroup_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>.Empty) {
+          result.repeatedGroup_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>();
         }
         result.repeatedGroup_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeRepeatedGroup(scg::IEnumerable<self::TestAllTypes.Types.RepeatedGroup> values) {
-        if (result.repeatedGroup_ == pbc::Lists<self::TestAllTypes.Types.RepeatedGroup>.Empty) {
-          result.repeatedGroup_ = new scg::List<self::TestAllTypes.Types.RepeatedGroup>();
+      public Builder AddRangeRepeatedGroup(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup> values) {
+        if (result.repeatedGroup_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>.Empty) {
+          result.repeatedGroup_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>();
         }
         base.AddRange(values, result.repeatedGroup_);
         return this;
       }
       public Builder ClearRepeatedGroup() {
-        result.repeatedGroup_ = pbc::Lists<self::TestAllTypes.Types.RepeatedGroup>.Empty;
+        result.repeatedGroup_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.RepeatedGroup>.Empty;
         return this;
       }
       
       // repeated .protobuf_unittest.TestAllTypes.NestedMessage repeated_nested_message = 48;
-      public scg::IList<self::TestAllTypes.Types.NestedMessage> RepeatedNestedMessageList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage> RepeatedNestedMessageList {
         get { return pbc::Lists.AsReadOnly(result.repeatedNestedMessage_); }
       }
       public int RepeatedNestedMessageCount {
         get { return result.RepeatedNestedMessageCount; }
       }
-      public self::TestAllTypes.Types.NestedMessage GetRepeatedNestedMessage(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage GetRepeatedNestedMessage(int index) {
         return result.GetRepeatedNestedMessage(index);
       }
-      public Builder SetRepeatedNestedMessage(int index, self::TestAllTypes.Types.NestedMessage value) {
+      public Builder SetRepeatedNestedMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) {
         result.repeatedNestedMessage_[index] = value;
         return this;
       }
-      public Builder SetRepeatedNestedMessage(int index, self::TestAllTypes.Types.NestedMessage.Builder builderForValue) {
+      public Builder SetRepeatedNestedMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) {
         result.repeatedNestedMessage_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddRepeatedNestedMessage(self::TestAllTypes.Types.NestedMessage value) {
-        if (result.repeatedNestedMessage_ == pbc::Lists<self::TestAllTypes.Types.NestedMessage>.Empty) {
-          result.repeatedNestedMessage_ = new scg::List<self::TestAllTypes.Types.NestedMessage>();
+      public Builder AddRepeatedNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) {
+        if (result.repeatedNestedMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>.Empty) {
+          result.repeatedNestedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>();
         }
         result.repeatedNestedMessage_.Add(value);
         return this;
       }
-      public Builder AddRepeatedNestedMessage(self::TestAllTypes.Types.NestedMessage.Builder builderForValue) {
-        if (result.repeatedNestedMessage_ == pbc::Lists<self::TestAllTypes.Types.NestedMessage>.Empty) {
-          result.repeatedNestedMessage_ = new scg::List<self::TestAllTypes.Types.NestedMessage>();
+      public Builder AddRepeatedNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) {
+        if (result.repeatedNestedMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>.Empty) {
+          result.repeatedNestedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>();
         }
         result.repeatedNestedMessage_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeRepeatedNestedMessage(scg::IEnumerable<self::TestAllTypes.Types.NestedMessage> values) {
-        if (result.repeatedNestedMessage_ == pbc::Lists<self::TestAllTypes.Types.NestedMessage>.Empty) {
-          result.repeatedNestedMessage_ = new scg::List<self::TestAllTypes.Types.NestedMessage>();
+      public Builder AddRangeRepeatedNestedMessage(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage> values) {
+        if (result.repeatedNestedMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>.Empty) {
+          result.repeatedNestedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>();
         }
         base.AddRange(values, result.repeatedNestedMessage_);
         return this;
       }
       public Builder ClearRepeatedNestedMessage() {
-        result.repeatedNestedMessage_ = pbc::Lists<self::TestAllTypes.Types.NestedMessage>.Empty;
+        result.repeatedNestedMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage>.Empty;
         return this;
       }
       
       // repeated .protobuf_unittest.ForeignMessage repeated_foreign_message = 49;
-      public scg::IList<self::ForeignMessage> RepeatedForeignMessageList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedForeignMessageList {
         get { return pbc::Lists.AsReadOnly(result.repeatedForeignMessage_); }
       }
       public int RepeatedForeignMessageCount {
         get { return result.RepeatedForeignMessageCount; }
       }
-      public self::ForeignMessage GetRepeatedForeignMessage(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignMessage GetRepeatedForeignMessage(int index) {
         return result.GetRepeatedForeignMessage(index);
       }
-      public Builder SetRepeatedForeignMessage(int index, self::ForeignMessage value) {
+      public Builder SetRepeatedForeignMessage(int index, global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
         result.repeatedForeignMessage_[index] = value;
         return this;
       }
-      public Builder SetRepeatedForeignMessage(int index, self::ForeignMessage.Builder builderForValue) {
+      public Builder SetRepeatedForeignMessage(int index, global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) {
         result.repeatedForeignMessage_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddRepeatedForeignMessage(self::ForeignMessage value) {
-        if (result.repeatedForeignMessage_ == pbc::Lists<self::ForeignMessage>.Empty) {
-          result.repeatedForeignMessage_ = new scg::List<self::ForeignMessage>();
+      public Builder AddRepeatedForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
+        if (result.repeatedForeignMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+          result.repeatedForeignMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
         }
         result.repeatedForeignMessage_.Add(value);
         return this;
       }
-      public Builder AddRepeatedForeignMessage(self::ForeignMessage.Builder builderForValue) {
-        if (result.repeatedForeignMessage_ == pbc::Lists<self::ForeignMessage>.Empty) {
-          result.repeatedForeignMessage_ = new scg::List<self::ForeignMessage>();
+      public Builder AddRepeatedForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) {
+        if (result.repeatedForeignMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+          result.repeatedForeignMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
         }
         result.repeatedForeignMessage_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeRepeatedForeignMessage(scg::IEnumerable<self::ForeignMessage> values) {
-        if (result.repeatedForeignMessage_ == pbc::Lists<self::ForeignMessage>.Empty) {
-          result.repeatedForeignMessage_ = new scg::List<self::ForeignMessage>();
+      public Builder AddRangeRepeatedForeignMessage(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> values) {
+        if (result.repeatedForeignMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+          result.repeatedForeignMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
         }
         base.AddRange(values, result.repeatedForeignMessage_);
         return this;
       }
       public Builder ClearRepeatedForeignMessage() {
-        result.repeatedForeignMessage_ = pbc::Lists<self::ForeignMessage>.Empty;
+        result.repeatedForeignMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty;
         return this;
       }
       
       // repeated .protobuf_unittest_import.ImportMessage repeated_import_message = 50;
-      public scg::IList<self::ImportMessage> RepeatedImportMessageList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportMessage> RepeatedImportMessageList {
         get { return pbc::Lists.AsReadOnly(result.repeatedImportMessage_); }
       }
       public int RepeatedImportMessageCount {
         get { return result.RepeatedImportMessageCount; }
       }
-      public self::ImportMessage GetRepeatedImportMessage(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.ImportMessage GetRepeatedImportMessage(int index) {
         return result.GetRepeatedImportMessage(index);
       }
-      public Builder SetRepeatedImportMessage(int index, self::ImportMessage value) {
+      public Builder SetRepeatedImportMessage(int index, global::Google.ProtocolBuffers.TestProtos.ImportMessage value) {
         result.repeatedImportMessage_[index] = value;
         return this;
       }
-      public Builder SetRepeatedImportMessage(int index, self::ImportMessage.Builder builderForValue) {
+      public Builder SetRepeatedImportMessage(int index, global::Google.ProtocolBuffers.TestProtos.ImportMessage.Builder builderForValue) {
         result.repeatedImportMessage_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddRepeatedImportMessage(self::ImportMessage value) {
-        if (result.repeatedImportMessage_ == pbc::Lists<self::ImportMessage>.Empty) {
-          result.repeatedImportMessage_ = new scg::List<self::ImportMessage>();
+      public Builder AddRepeatedImportMessage(global::Google.ProtocolBuffers.TestProtos.ImportMessage value) {
+        if (result.repeatedImportMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ImportMessage>.Empty) {
+          result.repeatedImportMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ImportMessage>();
         }
         result.repeatedImportMessage_.Add(value);
         return this;
       }
-      public Builder AddRepeatedImportMessage(self::ImportMessage.Builder builderForValue) {
-        if (result.repeatedImportMessage_ == pbc::Lists<self::ImportMessage>.Empty) {
-          result.repeatedImportMessage_ = new scg::List<self::ImportMessage>();
+      public Builder AddRepeatedImportMessage(global::Google.ProtocolBuffers.TestProtos.ImportMessage.Builder builderForValue) {
+        if (result.repeatedImportMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ImportMessage>.Empty) {
+          result.repeatedImportMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ImportMessage>();
         }
         result.repeatedImportMessage_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeRepeatedImportMessage(scg::IEnumerable<self::ImportMessage> values) {
-        if (result.repeatedImportMessage_ == pbc::Lists<self::ImportMessage>.Empty) {
-          result.repeatedImportMessage_ = new scg::List<self::ImportMessage>();
+      public Builder AddRangeRepeatedImportMessage(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.ImportMessage> values) {
+        if (result.repeatedImportMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ImportMessage>.Empty) {
+          result.repeatedImportMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ImportMessage>();
         }
         base.AddRange(values, result.repeatedImportMessage_);
         return this;
       }
       public Builder ClearRepeatedImportMessage() {
-        result.repeatedImportMessage_ = pbc::Lists<self::ImportMessage>.Empty;
+        result.repeatedImportMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ImportMessage>.Empty;
         return this;
       }
       
       // repeated .protobuf_unittest.TestAllTypes.NestedEnum repeated_nested_enum = 51;
-      public scg::IList<self::TestAllTypes.Types.NestedEnum> RepeatedNestedEnumList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum> RepeatedNestedEnumList {
         get { return pbc::Lists.AsReadOnly(result.repeatedNestedEnum_); }
       }
       public int RepeatedNestedEnumCount {
         get { return result.RepeatedNestedEnumCount; } 
       }
-      public self::TestAllTypes.Types.NestedEnum GetRepeatedNestedEnum(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum GetRepeatedNestedEnum(int index) {
         return result.GetRepeatedNestedEnum(index);
       }
-      public Builder SetRepeatedNestedEnum(int index, self::TestAllTypes.Types.NestedEnum value) {
+      public Builder SetRepeatedNestedEnum(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum value) {
         result.repeatedNestedEnum_[index] = value;
         return this;
       }
-      public Builder AddRepeatedNestedEnum(self::TestAllTypes.Types.NestedEnum value) {
+      public Builder AddRepeatedNestedEnum(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum value) {
         if (result.repeatedNestedEnum_.Count == 0) {
-          result.repeatedNestedEnum_ = new scg::List<self::TestAllTypes.Types.NestedEnum>();
+          result.repeatedNestedEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum>();
         }
         result.repeatedNestedEnum_.Add(value);
         return this;
       }
-      public Builder AddRangeRepeatedNestedEnum(scg::IEnumerable<self::TestAllTypes.Types.NestedEnum> values) {
+      public Builder AddRangeRepeatedNestedEnum(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum> values) {
         if (result.repeatedNestedEnum_.Count == 0) {
-          result.repeatedNestedEnum_ = new scg::List<self::TestAllTypes.Types.NestedEnum>();
+          result.repeatedNestedEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum>();
         }
         base.AddRange(values, result.repeatedNestedEnum_);
         return this;
       }
       public Builder ClearRepeatedNestedEnum() {
-        result.repeatedNestedEnum_ = pbc::Lists<self::TestAllTypes.Types.NestedEnum>.Empty;
+        result.repeatedNestedEnum_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum>.Empty;
         return this;
       }
       
       // repeated .protobuf_unittest.ForeignEnum repeated_foreign_enum = 52;
-      public scg::IList<self::ForeignEnum> RepeatedForeignEnumList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedForeignEnumList {
         get { return pbc::Lists.AsReadOnly(result.repeatedForeignEnum_); }
       }
       public int RepeatedForeignEnumCount {
         get { return result.RepeatedForeignEnumCount; } 
       }
-      public self::ForeignEnum GetRepeatedForeignEnum(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignEnum GetRepeatedForeignEnum(int index) {
         return result.GetRepeatedForeignEnum(index);
       }
-      public Builder SetRepeatedForeignEnum(int index, self::ForeignEnum value) {
+      public Builder SetRepeatedForeignEnum(int index, global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) {
         result.repeatedForeignEnum_[index] = value;
         return this;
       }
-      public Builder AddRepeatedForeignEnum(self::ForeignEnum value) {
+      public Builder AddRepeatedForeignEnum(global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) {
         if (result.repeatedForeignEnum_.Count == 0) {
-          result.repeatedForeignEnum_ = new scg::List<self::ForeignEnum>();
+          result.repeatedForeignEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>();
         }
         result.repeatedForeignEnum_.Add(value);
         return this;
       }
-      public Builder AddRangeRepeatedForeignEnum(scg::IEnumerable<self::ForeignEnum> values) {
+      public Builder AddRangeRepeatedForeignEnum(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> values) {
         if (result.repeatedForeignEnum_.Count == 0) {
-          result.repeatedForeignEnum_ = new scg::List<self::ForeignEnum>();
+          result.repeatedForeignEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>();
         }
         base.AddRange(values, result.repeatedForeignEnum_);
         return this;
       }
       public Builder ClearRepeatedForeignEnum() {
-        result.repeatedForeignEnum_ = pbc::Lists<self::ForeignEnum>.Empty;
+        result.repeatedForeignEnum_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>.Empty;
         return this;
       }
       
       // repeated .protobuf_unittest_import.ImportEnum repeated_import_enum = 53;
-      public scg::IList<self::ImportEnum> RepeatedImportEnumList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ImportEnum> RepeatedImportEnumList {
         get { return pbc::Lists.AsReadOnly(result.repeatedImportEnum_); }
       }
       public int RepeatedImportEnumCount {
         get { return result.RepeatedImportEnumCount; } 
       }
-      public self::ImportEnum GetRepeatedImportEnum(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.ImportEnum GetRepeatedImportEnum(int index) {
         return result.GetRepeatedImportEnum(index);
       }
-      public Builder SetRepeatedImportEnum(int index, self::ImportEnum value) {
+      public Builder SetRepeatedImportEnum(int index, global::Google.ProtocolBuffers.TestProtos.ImportEnum value) {
         result.repeatedImportEnum_[index] = value;
         return this;
       }
-      public Builder AddRepeatedImportEnum(self::ImportEnum value) {
+      public Builder AddRepeatedImportEnum(global::Google.ProtocolBuffers.TestProtos.ImportEnum value) {
         if (result.repeatedImportEnum_.Count == 0) {
-          result.repeatedImportEnum_ = new scg::List<self::ImportEnum>();
+          result.repeatedImportEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ImportEnum>();
         }
         result.repeatedImportEnum_.Add(value);
         return this;
       }
-      public Builder AddRangeRepeatedImportEnum(scg::IEnumerable<self::ImportEnum> values) {
+      public Builder AddRangeRepeatedImportEnum(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.ImportEnum> values) {
         if (result.repeatedImportEnum_.Count == 0) {
-          result.repeatedImportEnum_ = new scg::List<self::ImportEnum>();
+          result.repeatedImportEnum_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ImportEnum>();
         }
         base.AddRange(values, result.repeatedImportEnum_);
         return this;
       }
       public Builder ClearRepeatedImportEnum() {
-        result.repeatedImportEnum_ = pbc::Lists<self::ImportEnum>.Empty;
+        result.repeatedImportEnum_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ImportEnum>.Empty;
         return this;
       }
       
@@ -5254,7 +5252,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearDefaultBytes() {
         result.hasDefaultBytes = false;
-        result.defaultBytes_ = ((pb::ByteString) self::TestAllTypes.Descriptor.Fields[62].DefaultValue);
+        result.defaultBytes_ = ((pb::ByteString) global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Descriptor.Fields[62].DefaultValue);
         return this;
       }
       
@@ -5262,18 +5260,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasDefaultNestedEnum {
         get { return result.HasDefaultNestedEnum; }
       }
-      public self::TestAllTypes.Types.NestedEnum DefaultNestedEnum {
+      public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum DefaultNestedEnum {
         get { return result.DefaultNestedEnum; }
         set { SetDefaultNestedEnum(value); }
       }
-      public Builder SetDefaultNestedEnum(self::TestAllTypes.Types.NestedEnum value) {
+      public Builder SetDefaultNestedEnum(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum value) {
         result.hasDefaultNestedEnum = true;
         result.defaultNestedEnum_ = value;
         return this;
       }
       public Builder ClearDefaultNestedEnum() {
         result.hasDefaultNestedEnum = false;
-        result.defaultNestedEnum_ = self::TestAllTypes.Types.NestedEnum.BAR;
+        result.defaultNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum.BAR;
         return this;
       }
       
@@ -5281,18 +5279,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasDefaultForeignEnum {
         get { return result.HasDefaultForeignEnum; }
       }
-      public self::ForeignEnum DefaultForeignEnum {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignEnum DefaultForeignEnum {
         get { return result.DefaultForeignEnum; }
         set { SetDefaultForeignEnum(value); }
       }
-      public Builder SetDefaultForeignEnum(self::ForeignEnum value) {
+      public Builder SetDefaultForeignEnum(global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) {
         result.hasDefaultForeignEnum = true;
         result.defaultForeignEnum_ = value;
         return this;
       }
       public Builder ClearDefaultForeignEnum() {
         result.hasDefaultForeignEnum = false;
-        result.defaultForeignEnum_ = self::ForeignEnum.FOREIGN_BAR;
+        result.defaultForeignEnum_ = global::Google.ProtocolBuffers.TestProtos.ForeignEnum.FOREIGN_BAR;
         return this;
       }
       
@@ -5300,18 +5298,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasDefaultImportEnum {
         get { return result.HasDefaultImportEnum; }
       }
-      public self::ImportEnum DefaultImportEnum {
+      public global::Google.ProtocolBuffers.TestProtos.ImportEnum DefaultImportEnum {
         get { return result.DefaultImportEnum; }
         set { SetDefaultImportEnum(value); }
       }
-      public Builder SetDefaultImportEnum(self::ImportEnum value) {
+      public Builder SetDefaultImportEnum(global::Google.ProtocolBuffers.TestProtos.ImportEnum value) {
         result.hasDefaultImportEnum = true;
         result.defaultImportEnum_ = value;
         return this;
       }
       public Builder ClearDefaultImportEnum() {
         result.hasDefaultImportEnum = false;
-        result.defaultImportEnum_ = self::ImportEnum.IMPORT_BAR;
+        result.defaultImportEnum_ = global::Google.ProtocolBuffers.TestProtos.ImportEnum.IMPORT_BAR;
         return this;
       }
       
@@ -5366,11 +5364,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_ForeignMessage__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_ForeignMessage__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_ForeignMessage__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_ForeignMessage__FieldAccessorTable; }
     }
     
     // optional int32 c = 1;
@@ -5412,35 +5410,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::ForeignMessage ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.ForeignMessage ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::ForeignMessage ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.ForeignMessage ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ForeignMessage ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.ForeignMessage ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::ForeignMessage ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.ForeignMessage ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ForeignMessage ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.ForeignMessage ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::ForeignMessage ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.ForeignMessage ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ForeignMessage ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.ForeignMessage ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::ForeignMessage ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.ForeignMessage ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -5448,26 +5446,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::ForeignMessage prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.ForeignMessage prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::ForeignMessage, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.ForeignMessage, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::ForeignMessage.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder()
       internal Builder() {}
       
-      self::ForeignMessage result = new self::ForeignMessage();
+      global::Google.ProtocolBuffers.TestProtos.ForeignMessage result = new global::Google.ProtocolBuffers.TestProtos.ForeignMessage();
       
-      protected override self::ForeignMessage MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.ForeignMessage MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::ForeignMessage();
+        result = new global::Google.ProtocolBuffers.TestProtos.ForeignMessage();
         return this;
       }
       
@@ -5476,30 +5474,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::ForeignMessage.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Descriptor; }
       }
       
-      public override self::ForeignMessage DefaultInstanceForType {
-        get { return self::ForeignMessage.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.ForeignMessage DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance; }
       }
       
-      public override self::ForeignMessage BuildPartial() {
-        self::ForeignMessage returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.ForeignMessage BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.ForeignMessage returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::ForeignMessage) {
-          return MergeFrom((self::ForeignMessage) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.ForeignMessage) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.ForeignMessage) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::ForeignMessage other) {
-        if (other == self::ForeignMessage.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.ForeignMessage other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance) return this;
         if (other.HasC) {
           C = other.C;
         }
@@ -5569,11 +5567,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllExtensions__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllExtensions__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestAllExtensions__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestAllExtensions__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -5603,35 +5601,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestAllExtensions ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllExtensions ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestAllExtensions ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllExtensions ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestAllExtensions ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllExtensions ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestAllExtensions ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllExtensions ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestAllExtensions ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllExtensions ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestAllExtensions ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllExtensions ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestAllExtensions ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllExtensions ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestAllExtensions ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestAllExtensions ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -5639,26 +5637,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestAllExtensions prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestAllExtensions prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::ExtendableBuilder<self::TestAllExtensions, self::TestAllExtensions.Builder> {
+    public sealed partial class Builder : pb::ExtendableBuilder<global::Google.ProtocolBuffers.TestProtos.TestAllExtensions, global::Google.ProtocolBuffers.TestProtos.TestAllExtensions.Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestAllExtensions.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestAllExtensions.CreateBuilder()
       internal Builder() {}
       
-      self::TestAllExtensions result = new self::TestAllExtensions();
+      global::Google.ProtocolBuffers.TestProtos.TestAllExtensions result = new global::Google.ProtocolBuffers.TestProtos.TestAllExtensions();
       
-      protected override self::TestAllExtensions MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestAllExtensions MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestAllExtensions();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestAllExtensions();
         return this;
       }
       
@@ -5667,30 +5665,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestAllExtensions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestAllExtensions.Descriptor; }
       }
       
-      public override self::TestAllExtensions DefaultInstanceForType {
-        get { return self::TestAllExtensions.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestAllExtensions DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestAllExtensions.DefaultInstance; }
       }
       
-      public override self::TestAllExtensions BuildPartial() {
-        self::TestAllExtensions returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestAllExtensions BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestAllExtensions returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestAllExtensions) {
-          return MergeFrom((self::TestAllExtensions) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestAllExtensions) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestAllExtensions) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestAllExtensions other) {
-        if (other == self::TestAllExtensions.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestAllExtensions other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestAllExtensions.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -5734,11 +5732,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_OptionalGroup_extension__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_OptionalGroup_extension__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_OptionalGroup_extension__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_OptionalGroup_extension__FieldAccessorTable; }
     }
     
     // optional int32 a = 17;
@@ -5780,35 +5778,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::OptionalGroup_extension ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::OptionalGroup_extension ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::OptionalGroup_extension ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::OptionalGroup_extension ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::OptionalGroup_extension ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::OptionalGroup_extension ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::OptionalGroup_extension ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::OptionalGroup_extension ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -5816,26 +5814,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::OptionalGroup_extension prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::OptionalGroup_extension, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::OptionalGroup_extension.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension.CreateBuilder()
       internal Builder() {}
       
-      self::OptionalGroup_extension result = new self::OptionalGroup_extension();
+      global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension result = new global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension();
       
-      protected override self::OptionalGroup_extension MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::OptionalGroup_extension();
+        result = new global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension();
         return this;
       }
       
@@ -5844,30 +5842,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::OptionalGroup_extension.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension.Descriptor; }
       }
       
-      public override self::OptionalGroup_extension DefaultInstanceForType {
-        get { return self::OptionalGroup_extension.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension.DefaultInstance; }
       }
       
-      public override self::OptionalGroup_extension BuildPartial() {
-        self::OptionalGroup_extension returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::OptionalGroup_extension) {
-          return MergeFrom((self::OptionalGroup_extension) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::OptionalGroup_extension other) {
-        if (other == self::OptionalGroup_extension.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.OptionalGroup_extension.DefaultInstance) return this;
         if (other.HasA) {
           A = other.A;
         }
@@ -5937,11 +5935,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_RepeatedGroup_extension__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_RepeatedGroup_extension__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_RepeatedGroup_extension__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_RepeatedGroup_extension__FieldAccessorTable; }
     }
     
     // optional int32 a = 47;
@@ -5983,35 +5981,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::RepeatedGroup_extension ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::RepeatedGroup_extension ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::RepeatedGroup_extension ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::RepeatedGroup_extension ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::RepeatedGroup_extension ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::RepeatedGroup_extension ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::RepeatedGroup_extension ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::RepeatedGroup_extension ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -6019,26 +6017,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::RepeatedGroup_extension prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::RepeatedGroup_extension, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::RepeatedGroup_extension.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension.CreateBuilder()
       internal Builder() {}
       
-      self::RepeatedGroup_extension result = new self::RepeatedGroup_extension();
+      global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension result = new global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension();
       
-      protected override self::RepeatedGroup_extension MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::RepeatedGroup_extension();
+        result = new global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension();
         return this;
       }
       
@@ -6047,30 +6045,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::RepeatedGroup_extension.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension.Descriptor; }
       }
       
-      public override self::RepeatedGroup_extension DefaultInstanceForType {
-        get { return self::RepeatedGroup_extension.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension.DefaultInstance; }
       }
       
-      public override self::RepeatedGroup_extension BuildPartial() {
-        self::RepeatedGroup_extension returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::RepeatedGroup_extension) {
-          return MergeFrom((self::RepeatedGroup_extension) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::RepeatedGroup_extension other) {
-        if (other == self::RepeatedGroup_extension.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.RepeatedGroup_extension.DefaultInstance) return this;
         if (other.HasA) {
           A = other.A;
         }
@@ -6140,18 +6138,18 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestRequired__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestRequired__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestRequired__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestRequired__FieldAccessorTable; }
     }
     
-    public static readonly pb::GeneratedExtensionBase<self::TestRequired> Single =
-          pb::GeneratedSingleExtension<self::TestRequired>.CreateInstance(Descriptor.Extensions[0]);
+    public static readonly pb::GeneratedExtensionBase<global::Google.ProtocolBuffers.TestProtos.TestRequired> Single =
+          pb::GeneratedSingleExtension<global::Google.ProtocolBuffers.TestProtos.TestRequired>.CreateInstance(Descriptor.Extensions[0]);
     public static readonly
-      pb::GeneratedExtensionBase<scg::IList<self::TestRequired>> Multi =
-          pb::GeneratedRepeatExtension<self::TestRequired>.CreateInstance(Descriptor.Extensions[1]);
+      pb::GeneratedExtensionBase<scg::IList<global::Google.ProtocolBuffers.TestProtos.TestRequired>> Multi =
+          pb::GeneratedRepeatExtension<global::Google.ProtocolBuffers.TestProtos.TestRequired>.CreateInstance(Descriptor.Extensions[1]);
     #region Nested types
     public static class Types {
     }
@@ -6711,35 +6709,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestRequired ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequired ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestRequired ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequired ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestRequired ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequired ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestRequired ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequired ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestRequired ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequired ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestRequired ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequired ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestRequired ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequired ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestRequired ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequired ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -6747,26 +6745,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestRequired prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestRequired prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestRequired, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestRequired, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestRequired.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestRequired.CreateBuilder()
       internal Builder() {}
       
-      self::TestRequired result = new self::TestRequired();
+      global::Google.ProtocolBuffers.TestProtos.TestRequired result = new global::Google.ProtocolBuffers.TestProtos.TestRequired();
       
-      protected override self::TestRequired MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestRequired MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestRequired();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestRequired();
         return this;
       }
       
@@ -6775,30 +6773,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestRequired.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestRequired.Descriptor; }
       }
       
-      public override self::TestRequired DefaultInstanceForType {
-        get { return self::TestRequired.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestRequired DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestRequired.DefaultInstance; }
       }
       
-      public override self::TestRequired BuildPartial() {
-        self::TestRequired returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestRequired BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestRequired returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestRequired) {
-          return MergeFrom((self::TestRequired) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestRequired) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestRequired) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestRequired other) {
-        if (other == self::TestRequired.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestRequired other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestRequired.DefaultInstance) return this;
         if (other.HasA) {
           A = other.A;
         }
@@ -7700,32 +7698,32 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestRequiredForeign__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestRequiredForeign__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestRequiredForeign__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestRequiredForeign__FieldAccessorTable; }
     }
     
     // optional .protobuf_unittest.TestRequired optional_message = 1;
     private bool hasOptionalMessage;
-    private self::TestRequired optionalMessage_ = self::TestRequired.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestRequired optionalMessage_ = global::Google.ProtocolBuffers.TestProtos.TestRequired.DefaultInstance;
     public bool HasOptionalMessage {
       get { return hasOptionalMessage; }
     }
-    public self::TestRequired OptionalMessage {
+    public global::Google.ProtocolBuffers.TestProtos.TestRequired OptionalMessage {
       get { return optionalMessage_; }
     }
     
     // repeated .protobuf_unittest.TestRequired repeated_message = 2;
-    private scg::IList<self::TestRequired> repeatedMessage_ = pbc::Lists<self::TestRequired>.Empty;
-    public scg::IList<self::TestRequired> RepeatedMessageList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.TestRequired> repeatedMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestRequired>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestRequired> RepeatedMessageList {
       get { return repeatedMessage_; } 
     }
     public int RepeatedMessageCount
       { get { return repeatedMessage_.Count; }
     }
-    public self::TestRequired GetRepeatedMessage(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.TestRequired GetRepeatedMessage(int index) {
       return repeatedMessage_ [index];
     }
     
@@ -7744,7 +7742,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         if (HasOptionalMessage) {
           if (!OptionalMessage.IsInitialized) return false;
         }
-        foreach (self::TestRequired element in RepeatedMessageList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.TestRequired element in RepeatedMessageList) {
           if (!element.IsInitialized) return false;
         }
         return true;
@@ -7755,7 +7753,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       if (HasOptionalMessage) {
         output.WriteMessage(1, OptionalMessage);
       }
-      foreach (self::TestRequired element in RepeatedMessageList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.TestRequired element in RepeatedMessageList) {
         output.WriteMessage(2, element);
       }
       if (HasDummy) {
@@ -7774,7 +7772,7 @@ namespace Google.ProtocolBuffers.TestProtos {
         if (HasOptionalMessage) {
           size += pb::CodedOutputStream.ComputeMessageSize(1, OptionalMessage);
         }
-        foreach (self::TestRequired element in RepeatedMessageList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.TestRequired element in RepeatedMessageList) {
           size += pb::CodedOutputStream.ComputeMessageSize(2, element);
         }
         if (HasDummy) {
@@ -7786,35 +7784,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestRequiredForeign ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestRequiredForeign ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestRequiredForeign ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestRequiredForeign ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestRequiredForeign ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestRequiredForeign ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestRequiredForeign ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestRequiredForeign ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -7822,26 +7820,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestRequiredForeign prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestRequiredForeign, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestRequiredForeign.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign.CreateBuilder()
       internal Builder() {}
       
-      self::TestRequiredForeign result = new self::TestRequiredForeign();
+      global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign result = new global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign();
       
-      protected override self::TestRequiredForeign MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestRequiredForeign();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign();
         return this;
       }
       
@@ -7850,39 +7848,39 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestRequiredForeign.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign.Descriptor; }
       }
       
-      public override self::TestRequiredForeign DefaultInstanceForType {
-        get { return self::TestRequiredForeign.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign.DefaultInstance; }
       }
       
-      public override self::TestRequiredForeign BuildPartial() {
-        if (result.repeatedMessage_ != pbc::Lists<self::TestRequired>.Empty) {
-          result.repeatedMessage_ = pbc::Lists<self::TestRequired>.AsReadOnly(result.repeatedMessage_);
+      public override global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign BuildPartial() {
+        if (result.repeatedMessage_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestRequired>.Empty) {
+          result.repeatedMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestRequired>.AsReadOnly(result.repeatedMessage_);
         }
-        self::TestRequiredForeign returnMe = result;
+        global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestRequiredForeign) {
-          return MergeFrom((self::TestRequiredForeign) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestRequiredForeign other) {
-        if (other == self::TestRequiredForeign.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestRequiredForeign.DefaultInstance) return this;
         if (other.HasOptionalMessage) {
           MergeOptionalMessage(other.OptionalMessage);
         }
         if (other.repeatedMessage_.Count != 0) {
           if (result.repeatedMessage_.Count == 0) {
-            result.repeatedMessage_ = new scg::List<self::TestRequired>();
+            result.repeatedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestRequired>();
           }
           base.AddRange(other.repeatedMessage_, result.repeatedMessage_);
         }
@@ -7915,7 +7913,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 10: {
-              self::TestRequired.Builder subBuilder = self::TestRequired.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestRequired.CreateBuilder();
               if (HasOptionalMessage) {
                 subBuilder.MergeFrom(OptionalMessage);
               }
@@ -7924,7 +7922,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 18: {
-              self::TestRequired.Builder subBuilder = self::TestRequired.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestRequired.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddRepeatedMessage(subBuilder.BuildPartial());
               break;
@@ -7942,25 +7940,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalMessage {
         get { return result.HasOptionalMessage; }
       }
-      public self::TestRequired OptionalMessage {
+      public global::Google.ProtocolBuffers.TestProtos.TestRequired OptionalMessage {
         get { return result.OptionalMessage; }
         set { SetOptionalMessage(value); }
       }
-      public Builder SetOptionalMessage(self::TestRequired value) {
+      public Builder SetOptionalMessage(global::Google.ProtocolBuffers.TestProtos.TestRequired value) {
         result.hasOptionalMessage = true;
         result.optionalMessage_ = value;
         return this;
       }
-      public Builder SetOptionalMessage(self::TestRequired.Builder builderForValue) {
+      public Builder SetOptionalMessage(global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder builderForValue) {
         result.hasOptionalMessage = true;
         result.optionalMessage_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptionalMessage(self::TestRequired value) {
+      public Builder MergeOptionalMessage(global::Google.ProtocolBuffers.TestProtos.TestRequired value) {
         if (result.HasOptionalMessage &&
-            result.optionalMessage_ != self::TestRequired.DefaultInstance) {
+            result.optionalMessage_ != global::Google.ProtocolBuffers.TestProtos.TestRequired.DefaultInstance) {
           result.optionalMessage_ =
-            self::TestRequired.CreateBuilder(result.optionalMessage_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestRequired.CreateBuilder(result.optionalMessage_).MergeFrom(value).BuildPartial();
         } else {
           result.optionalMessage_ = value;
         }
@@ -7969,51 +7967,51 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearOptionalMessage() {
         result.hasOptionalMessage = false;
-        result.optionalMessage_ = self::TestRequired.DefaultInstance;
+        result.optionalMessage_ = global::Google.ProtocolBuffers.TestProtos.TestRequired.DefaultInstance;
         return this;
       }
       
       // repeated .protobuf_unittest.TestRequired repeated_message = 2;
-      public scg::IList<self::TestRequired> RepeatedMessageList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.TestRequired> RepeatedMessageList {
         get { return pbc::Lists.AsReadOnly(result.repeatedMessage_); }
       }
       public int RepeatedMessageCount {
         get { return result.RepeatedMessageCount; }
       }
-      public self::TestRequired GetRepeatedMessage(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.TestRequired GetRepeatedMessage(int index) {
         return result.GetRepeatedMessage(index);
       }
-      public Builder SetRepeatedMessage(int index, self::TestRequired value) {
+      public Builder SetRepeatedMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestRequired value) {
         result.repeatedMessage_[index] = value;
         return this;
       }
-      public Builder SetRepeatedMessage(int index, self::TestRequired.Builder builderForValue) {
+      public Builder SetRepeatedMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder builderForValue) {
         result.repeatedMessage_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddRepeatedMessage(self::TestRequired value) {
-        if (result.repeatedMessage_ == pbc::Lists<self::TestRequired>.Empty) {
-          result.repeatedMessage_ = new scg::List<self::TestRequired>();
+      public Builder AddRepeatedMessage(global::Google.ProtocolBuffers.TestProtos.TestRequired value) {
+        if (result.repeatedMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestRequired>.Empty) {
+          result.repeatedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestRequired>();
         }
         result.repeatedMessage_.Add(value);
         return this;
       }
-      public Builder AddRepeatedMessage(self::TestRequired.Builder builderForValue) {
-        if (result.repeatedMessage_ == pbc::Lists<self::TestRequired>.Empty) {
-          result.repeatedMessage_ = new scg::List<self::TestRequired>();
+      public Builder AddRepeatedMessage(global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder builderForValue) {
+        if (result.repeatedMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestRequired>.Empty) {
+          result.repeatedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestRequired>();
         }
         result.repeatedMessage_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeRepeatedMessage(scg::IEnumerable<self::TestRequired> values) {
-        if (result.repeatedMessage_ == pbc::Lists<self::TestRequired>.Empty) {
-          result.repeatedMessage_ = new scg::List<self::TestRequired>();
+      public Builder AddRangeRepeatedMessage(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.TestRequired> values) {
+        if (result.repeatedMessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestRequired>.Empty) {
+          result.repeatedMessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.TestRequired>();
         }
         base.AddRange(values, result.repeatedMessage_);
         return this;
       }
       public Builder ClearRepeatedMessage() {
-        result.repeatedMessage_ = pbc::Lists<self::TestRequired>.Empty;
+        result.repeatedMessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.TestRequired>.Empty;
         return this;
       }
       
@@ -8049,20 +8047,20 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestForeignNested__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestForeignNested__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestForeignNested__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestForeignNested__FieldAccessorTable; }
     }
     
     // optional .protobuf_unittest.TestAllTypes.NestedMessage foreign_nested = 1;
     private bool hasForeignNested;
-    private self::TestAllTypes.Types.NestedMessage foreignNested_ = self::TestAllTypes.Types.NestedMessage.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage foreignNested_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance;
     public bool HasForeignNested {
       get { return hasForeignNested; }
     }
-    public self::TestAllTypes.Types.NestedMessage ForeignNested {
+    public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ForeignNested {
       get { return foreignNested_; }
     }
     
@@ -8095,35 +8093,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestForeignNested ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestForeignNested ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestForeignNested ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestForeignNested ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestForeignNested ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestForeignNested ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestForeignNested ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestForeignNested ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestForeignNested ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestForeignNested ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestForeignNested ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestForeignNested ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestForeignNested ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestForeignNested ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestForeignNested ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestForeignNested ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -8131,26 +8129,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestForeignNested prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestForeignNested prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestForeignNested, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestForeignNested, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestForeignNested.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestForeignNested.CreateBuilder()
       internal Builder() {}
       
-      self::TestForeignNested result = new self::TestForeignNested();
+      global::Google.ProtocolBuffers.TestProtos.TestForeignNested result = new global::Google.ProtocolBuffers.TestProtos.TestForeignNested();
       
-      protected override self::TestForeignNested MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestForeignNested MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestForeignNested();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestForeignNested();
         return this;
       }
       
@@ -8159,30 +8157,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestForeignNested.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestForeignNested.Descriptor; }
       }
       
-      public override self::TestForeignNested DefaultInstanceForType {
-        get { return self::TestForeignNested.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestForeignNested DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestForeignNested.DefaultInstance; }
       }
       
-      public override self::TestForeignNested BuildPartial() {
-        self::TestForeignNested returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestForeignNested BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestForeignNested returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestForeignNested) {
-          return MergeFrom((self::TestForeignNested) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestForeignNested) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestForeignNested) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestForeignNested other) {
-        if (other == self::TestForeignNested.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestForeignNested other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestForeignNested.DefaultInstance) return this;
         if (other.HasForeignNested) {
           MergeForeignNested(other.ForeignNested);
         }
@@ -8212,7 +8210,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 10: {
-              self::TestAllTypes.Types.NestedMessage.Builder subBuilder = self::TestAllTypes.Types.NestedMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder();
               if (HasForeignNested) {
                 subBuilder.MergeFrom(ForeignNested);
               }
@@ -8229,25 +8227,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasForeignNested {
         get { return result.HasForeignNested; }
       }
-      public self::TestAllTypes.Types.NestedMessage ForeignNested {
+      public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage ForeignNested {
         get { return result.ForeignNested; }
         set { SetForeignNested(value); }
       }
-      public Builder SetForeignNested(self::TestAllTypes.Types.NestedMessage value) {
+      public Builder SetForeignNested(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) {
         result.hasForeignNested = true;
         result.foreignNested_ = value;
         return this;
       }
-      public Builder SetForeignNested(self::TestAllTypes.Types.NestedMessage.Builder builderForValue) {
+      public Builder SetForeignNested(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) {
         result.hasForeignNested = true;
         result.foreignNested_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeForeignNested(self::TestAllTypes.Types.NestedMessage value) {
+      public Builder MergeForeignNested(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) {
         if (result.HasForeignNested &&
-            result.foreignNested_ != self::TestAllTypes.Types.NestedMessage.DefaultInstance) {
+            result.foreignNested_ != global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance) {
           result.foreignNested_ =
-            self::TestAllTypes.Types.NestedMessage.CreateBuilder(result.foreignNested_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder(result.foreignNested_).MergeFrom(value).BuildPartial();
         } else {
           result.foreignNested_ = value;
         }
@@ -8256,7 +8254,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearForeignNested() {
         result.hasForeignNested = false;
-        result.foreignNested_ = self::TestAllTypes.Types.NestedMessage.DefaultInstance;
+        result.foreignNested_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance;
         return this;
       }
     }
@@ -8273,11 +8271,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestEmptyMessage__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestEmptyMessage__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestEmptyMessage__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestEmptyMessage__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -8303,35 +8301,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestEmptyMessage ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestEmptyMessage ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestEmptyMessage ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestEmptyMessage ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestEmptyMessage ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestEmptyMessage ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestEmptyMessage ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestEmptyMessage ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -8339,26 +8337,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestEmptyMessage prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestEmptyMessage, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestEmptyMessage.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage.CreateBuilder()
       internal Builder() {}
       
-      self::TestEmptyMessage result = new self::TestEmptyMessage();
+      global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage result = new global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage();
       
-      protected override self::TestEmptyMessage MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestEmptyMessage();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage();
         return this;
       }
       
@@ -8367,30 +8365,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestEmptyMessage.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage.Descriptor; }
       }
       
-      public override self::TestEmptyMessage DefaultInstanceForType {
-        get { return self::TestEmptyMessage.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage.DefaultInstance; }
       }
       
-      public override self::TestEmptyMessage BuildPartial() {
-        self::TestEmptyMessage returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestEmptyMessage) {
-          return MergeFrom((self::TestEmptyMessage) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestEmptyMessage other) {
-        if (other == self::TestEmptyMessage.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestEmptyMessage.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -8434,11 +8432,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestEmptyMessageWithExtensions__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestEmptyMessageWithExtensions__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestEmptyMessageWithExtensions__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestEmptyMessageWithExtensions__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -8468,35 +8466,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestEmptyMessageWithExtensions ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestEmptyMessageWithExtensions ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestEmptyMessageWithExtensions ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestEmptyMessageWithExtensions ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestEmptyMessageWithExtensions ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestEmptyMessageWithExtensions ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestEmptyMessageWithExtensions ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestEmptyMessageWithExtensions ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -8504,26 +8502,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestEmptyMessageWithExtensions prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::ExtendableBuilder<self::TestEmptyMessageWithExtensions, self::TestEmptyMessageWithExtensions.Builder> {
+    public sealed partial class Builder : pb::ExtendableBuilder<global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions, global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions.Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestEmptyMessageWithExtensions.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions.CreateBuilder()
       internal Builder() {}
       
-      self::TestEmptyMessageWithExtensions result = new self::TestEmptyMessageWithExtensions();
+      global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions result = new global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions();
       
-      protected override self::TestEmptyMessageWithExtensions MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestEmptyMessageWithExtensions();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions();
         return this;
       }
       
@@ -8532,30 +8530,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestEmptyMessageWithExtensions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions.Descriptor; }
       }
       
-      public override self::TestEmptyMessageWithExtensions DefaultInstanceForType {
-        get { return self::TestEmptyMessageWithExtensions.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions.DefaultInstance; }
       }
       
-      public override self::TestEmptyMessageWithExtensions BuildPartial() {
-        self::TestEmptyMessageWithExtensions returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestEmptyMessageWithExtensions) {
-          return MergeFrom((self::TestEmptyMessageWithExtensions) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestEmptyMessageWithExtensions other) {
-        if (other == self::TestEmptyMessageWithExtensions.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestEmptyMessageWithExtensions.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -8599,11 +8597,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestReallyLargeTagNumber__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestReallyLargeTagNumber__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestReallyLargeTagNumber__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestReallyLargeTagNumber__FieldAccessorTable; }
     }
     
     // optional int32 a = 1;
@@ -8661,35 +8659,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestReallyLargeTagNumber ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestReallyLargeTagNumber ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestReallyLargeTagNumber ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestReallyLargeTagNumber ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestReallyLargeTagNumber ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestReallyLargeTagNumber ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestReallyLargeTagNumber ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestReallyLargeTagNumber ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -8697,26 +8695,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestReallyLargeTagNumber prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestReallyLargeTagNumber, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestReallyLargeTagNumber.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber.CreateBuilder()
       internal Builder() {}
       
-      self::TestReallyLargeTagNumber result = new self::TestReallyLargeTagNumber();
+      global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber result = new global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber();
       
-      protected override self::TestReallyLargeTagNumber MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestReallyLargeTagNumber();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber();
         return this;
       }
       
@@ -8725,30 +8723,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestReallyLargeTagNumber.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber.Descriptor; }
       }
       
-      public override self::TestReallyLargeTagNumber DefaultInstanceForType {
-        get { return self::TestReallyLargeTagNumber.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber.DefaultInstance; }
       }
       
-      public override self::TestReallyLargeTagNumber BuildPartial() {
-        self::TestReallyLargeTagNumber returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestReallyLargeTagNumber) {
-          return MergeFrom((self::TestReallyLargeTagNumber) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestReallyLargeTagNumber other) {
-        if (other == self::TestReallyLargeTagNumber.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestReallyLargeTagNumber.DefaultInstance) return this;
         if (other.HasA) {
           A = other.A;
         }
@@ -8844,20 +8842,20 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestRecursiveMessage__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestRecursiveMessage__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestRecursiveMessage__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestRecursiveMessage__FieldAccessorTable; }
     }
     
     // optional .protobuf_unittest.TestRecursiveMessage a = 1;
     private bool hasA;
-    private self::TestRecursiveMessage a_ = self::TestRecursiveMessage.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage a_ = global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.DefaultInstance;
     public bool HasA {
       get { return hasA; }
     }
-    public self::TestRecursiveMessage A {
+    public global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage A {
       get { return a_; }
     }
     
@@ -8906,35 +8904,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestRecursiveMessage ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestRecursiveMessage ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestRecursiveMessage ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestRecursiveMessage ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestRecursiveMessage ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestRecursiveMessage ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestRecursiveMessage ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestRecursiveMessage ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -8942,26 +8940,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestRecursiveMessage prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestRecursiveMessage, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestRecursiveMessage.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.CreateBuilder()
       internal Builder() {}
       
-      self::TestRecursiveMessage result = new self::TestRecursiveMessage();
+      global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage result = new global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage();
       
-      protected override self::TestRecursiveMessage MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestRecursiveMessage();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage();
         return this;
       }
       
@@ -8970,30 +8968,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestRecursiveMessage.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.Descriptor; }
       }
       
-      public override self::TestRecursiveMessage DefaultInstanceForType {
-        get { return self::TestRecursiveMessage.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.DefaultInstance; }
       }
       
-      public override self::TestRecursiveMessage BuildPartial() {
-        self::TestRecursiveMessage returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestRecursiveMessage) {
-          return MergeFrom((self::TestRecursiveMessage) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestRecursiveMessage other) {
-        if (other == self::TestRecursiveMessage.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.DefaultInstance) return this;
         if (other.HasA) {
           MergeA(other.A);
         }
@@ -9026,7 +9024,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 10: {
-              self::TestRecursiveMessage.Builder subBuilder = self::TestRecursiveMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.CreateBuilder();
               if (HasA) {
                 subBuilder.MergeFrom(A);
               }
@@ -9047,25 +9045,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasA {
         get { return result.HasA; }
       }
-      public self::TestRecursiveMessage A {
+      public global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage A {
         get { return result.A; }
         set { SetA(value); }
       }
-      public Builder SetA(self::TestRecursiveMessage value) {
+      public Builder SetA(global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage value) {
         result.hasA = true;
         result.a_ = value;
         return this;
       }
-      public Builder SetA(self::TestRecursiveMessage.Builder builderForValue) {
+      public Builder SetA(global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.Builder builderForValue) {
         result.hasA = true;
         result.a_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeA(self::TestRecursiveMessage value) {
+      public Builder MergeA(global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage value) {
         if (result.HasA &&
-            result.a_ != self::TestRecursiveMessage.DefaultInstance) {
+            result.a_ != global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.DefaultInstance) {
           result.a_ =
-            self::TestRecursiveMessage.CreateBuilder(result.a_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.CreateBuilder(result.a_).MergeFrom(value).BuildPartial();
         } else {
           result.a_ = value;
         }
@@ -9074,7 +9072,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearA() {
         result.hasA = false;
-        result.a_ = self::TestRecursiveMessage.DefaultInstance;
+        result.a_ = global::Google.ProtocolBuffers.TestProtos.TestRecursiveMessage.DefaultInstance;
         return this;
       }
       
@@ -9110,20 +9108,20 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestMutualRecursionA__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestMutualRecursionA__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestMutualRecursionA__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestMutualRecursionA__FieldAccessorTable; }
     }
     
     // optional .protobuf_unittest.TestMutualRecursionB bb = 1;
     private bool hasBb;
-    private self::TestMutualRecursionB bb_ = self::TestMutualRecursionB.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB bb_ = global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.DefaultInstance;
     public bool HasBb {
       get { return hasBb; }
     }
-    public self::TestMutualRecursionB Bb {
+    public global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB Bb {
       get { return bb_; }
     }
     
@@ -9156,35 +9154,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestMutualRecursionA ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMutualRecursionA ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMutualRecursionA ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMutualRecursionA ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMutualRecursionA ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMutualRecursionA ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMutualRecursionA ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMutualRecursionA ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -9192,26 +9190,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestMutualRecursionA prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestMutualRecursionA, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestMutualRecursionA.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.CreateBuilder()
       internal Builder() {}
       
-      self::TestMutualRecursionA result = new self::TestMutualRecursionA();
+      global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA result = new global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA();
       
-      protected override self::TestMutualRecursionA MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestMutualRecursionA();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA();
         return this;
       }
       
@@ -9220,30 +9218,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestMutualRecursionA.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.Descriptor; }
       }
       
-      public override self::TestMutualRecursionA DefaultInstanceForType {
-        get { return self::TestMutualRecursionA.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.DefaultInstance; }
       }
       
-      public override self::TestMutualRecursionA BuildPartial() {
-        self::TestMutualRecursionA returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestMutualRecursionA) {
-          return MergeFrom((self::TestMutualRecursionA) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestMutualRecursionA other) {
-        if (other == self::TestMutualRecursionA.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.DefaultInstance) return this;
         if (other.HasBb) {
           MergeBb(other.Bb);
         }
@@ -9273,7 +9271,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 10: {
-              self::TestMutualRecursionB.Builder subBuilder = self::TestMutualRecursionB.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.CreateBuilder();
               if (HasBb) {
                 subBuilder.MergeFrom(Bb);
               }
@@ -9290,25 +9288,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasBb {
         get { return result.HasBb; }
       }
-      public self::TestMutualRecursionB Bb {
+      public global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB Bb {
         get { return result.Bb; }
         set { SetBb(value); }
       }
-      public Builder SetBb(self::TestMutualRecursionB value) {
+      public Builder SetBb(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB value) {
         result.hasBb = true;
         result.bb_ = value;
         return this;
       }
-      public Builder SetBb(self::TestMutualRecursionB.Builder builderForValue) {
+      public Builder SetBb(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.Builder builderForValue) {
         result.hasBb = true;
         result.bb_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeBb(self::TestMutualRecursionB value) {
+      public Builder MergeBb(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB value) {
         if (result.HasBb &&
-            result.bb_ != self::TestMutualRecursionB.DefaultInstance) {
+            result.bb_ != global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.DefaultInstance) {
           result.bb_ =
-            self::TestMutualRecursionB.CreateBuilder(result.bb_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.CreateBuilder(result.bb_).MergeFrom(value).BuildPartial();
         } else {
           result.bb_ = value;
         }
@@ -9317,7 +9315,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearBb() {
         result.hasBb = false;
-        result.bb_ = self::TestMutualRecursionB.DefaultInstance;
+        result.bb_ = global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.DefaultInstance;
         return this;
       }
     }
@@ -9334,20 +9332,20 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestMutualRecursionB__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestMutualRecursionB__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestMutualRecursionB__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestMutualRecursionB__FieldAccessorTable; }
     }
     
     // optional .protobuf_unittest.TestMutualRecursionA a = 1;
     private bool hasA;
-    private self::TestMutualRecursionA a_ = self::TestMutualRecursionA.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA a_ = global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.DefaultInstance;
     public bool HasA {
       get { return hasA; }
     }
-    public self::TestMutualRecursionA A {
+    public global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA A {
       get { return a_; }
     }
     
@@ -9396,35 +9394,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestMutualRecursionB ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMutualRecursionB ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMutualRecursionB ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestMutualRecursionB ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMutualRecursionB ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMutualRecursionB ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestMutualRecursionB ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestMutualRecursionB ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -9432,26 +9430,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestMutualRecursionB prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestMutualRecursionB, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestMutualRecursionB.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.CreateBuilder()
       internal Builder() {}
       
-      self::TestMutualRecursionB result = new self::TestMutualRecursionB();
+      global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB result = new global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB();
       
-      protected override self::TestMutualRecursionB MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestMutualRecursionB();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB();
         return this;
       }
       
@@ -9460,30 +9458,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestMutualRecursionB.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.Descriptor; }
       }
       
-      public override self::TestMutualRecursionB DefaultInstanceForType {
-        get { return self::TestMutualRecursionB.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.DefaultInstance; }
       }
       
-      public override self::TestMutualRecursionB BuildPartial() {
-        self::TestMutualRecursionB returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestMutualRecursionB) {
-          return MergeFrom((self::TestMutualRecursionB) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestMutualRecursionB other) {
-        if (other == self::TestMutualRecursionB.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionB.DefaultInstance) return this;
         if (other.HasA) {
           MergeA(other.A);
         }
@@ -9516,7 +9514,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 10: {
-              self::TestMutualRecursionA.Builder subBuilder = self::TestMutualRecursionA.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.CreateBuilder();
               if (HasA) {
                 subBuilder.MergeFrom(A);
               }
@@ -9537,25 +9535,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasA {
         get { return result.HasA; }
       }
-      public self::TestMutualRecursionA A {
+      public global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA A {
         get { return result.A; }
         set { SetA(value); }
       }
-      public Builder SetA(self::TestMutualRecursionA value) {
+      public Builder SetA(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA value) {
         result.hasA = true;
         result.a_ = value;
         return this;
       }
-      public Builder SetA(self::TestMutualRecursionA.Builder builderForValue) {
+      public Builder SetA(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.Builder builderForValue) {
         result.hasA = true;
         result.a_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeA(self::TestMutualRecursionA value) {
+      public Builder MergeA(global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA value) {
         if (result.HasA &&
-            result.a_ != self::TestMutualRecursionA.DefaultInstance) {
+            result.a_ != global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.DefaultInstance) {
           result.a_ =
-            self::TestMutualRecursionA.CreateBuilder(result.a_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.CreateBuilder(result.a_).MergeFrom(value).BuildPartial();
         } else {
           result.a_ = value;
         }
@@ -9564,7 +9562,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearA() {
         result.hasA = false;
-        result.a_ = self::TestMutualRecursionA.DefaultInstance;
+        result.a_ = global::Google.ProtocolBuffers.TestProtos.TestMutualRecursionA.DefaultInstance;
         return this;
       }
       
@@ -9600,11 +9598,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber__FieldAccessorTable; }
     }
     
     #region Nested types
@@ -9620,11 +9618,11 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         
         public static pbd::MessageDescriptor Descriptor {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber_Foo__Descriptor; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber_Foo__Descriptor; }
         }
         
         protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber_Foo__FieldAccessorTable; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber_Foo__FieldAccessorTable; }
         }
         
         // optional int32 a = 1;
@@ -9666,35 +9664,35 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
         }
         
-        public static self::TestDupFieldNumber.Types.Foo ParseFrom(pb::ByteString data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo ParseFrom(pb::ByteString data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Foo ParseFrom(pb::ByteString data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo ParseFrom(pb::ByteString data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Foo ParseFrom(byte[] data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo ParseFrom(byte[] data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Foo ParseFrom(byte[] data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo ParseFrom(byte[] data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Foo ParseFrom(global::System.IO.Stream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo ParseFrom(global::System.IO.Stream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Foo ParseFrom(
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo ParseFrom(
             global::System.IO.Stream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Foo ParseFrom(pb::CodedInputStream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo ParseFrom(pb::CodedInputStream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Foo ParseFrom(pb::CodedInputStream input,
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo ParseFrom(pb::CodedInputStream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
@@ -9702,26 +9700,26 @@ namespace Google.ProtocolBuffers.TestProtos {
         
         public static Builder CreateBuilder() { return new Builder(); }
         public override Builder CreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder(self::TestDupFieldNumber.Types.Foo prototype) {
+        public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo prototype) {
           return (Builder) new Builder().MergeFrom(prototype);
         }
         
-        public sealed partial class Builder : pb::GeneratedBuilder<self::TestDupFieldNumber.Types.Foo, Builder> {
+        public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo, Builder> {
           protected override Builder ThisBuilder {
             get { return this; }
           }
           
-          // Construct using self::TestDupFieldNumber.Types.Foo.CreateBuilder()
+          // Construct using global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.CreateBuilder()
           internal Builder() {}
           
-          self::TestDupFieldNumber.Types.Foo result = new self::TestDupFieldNumber.Types.Foo();
+          global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo result = new global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo();
           
-          protected override self::TestDupFieldNumber.Types.Foo MessageBeingBuilt {
+          protected override global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo MessageBeingBuilt {
             get { return result; }
           }
           
           public override Builder Clear() {
-            result = new self::TestDupFieldNumber.Types.Foo();
+            result = new global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo();
             return this;
           }
           
@@ -9730,30 +9728,30 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return self::TestDupFieldNumber.Types.Foo.Descriptor; }
+            get { return global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.Descriptor; }
           }
           
-          public override self::TestDupFieldNumber.Types.Foo DefaultInstanceForType {
-            get { return self::TestDupFieldNumber.Types.Foo.DefaultInstance; }
+          public override global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo DefaultInstanceForType {
+            get { return global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.DefaultInstance; }
           }
           
-          public override self::TestDupFieldNumber.Types.Foo BuildPartial() {
-            self::TestDupFieldNumber.Types.Foo returnMe = result;
+          public override global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo BuildPartial() {
+            global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo returnMe = result;
             result = null;
             return returnMe;
           }
           
           public override Builder MergeFrom(pb::IMessage other) {
-            if (other is self::TestDupFieldNumber.Types.Foo) {
-              return MergeFrom((self::TestDupFieldNumber.Types.Foo) other);
+            if (other is global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo) {
+              return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo) other);
             } else {
               base.MergeFrom(other);
               return this;
             }
           }
           
-          public override Builder MergeFrom(self::TestDupFieldNumber.Types.Foo other) {
-            if (other == self::TestDupFieldNumber.Types.Foo.DefaultInstance) return this;
+          public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo other) {
+            if (other == global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.DefaultInstance) return this;
             if (other.HasA) {
               A = other.A;
             }
@@ -9823,11 +9821,11 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         
         public static pbd::MessageDescriptor Descriptor {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber_Bar__Descriptor; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber_Bar__Descriptor; }
         }
         
         protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber_Bar__FieldAccessorTable; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestDupFieldNumber_Bar__FieldAccessorTable; }
         }
         
         // optional int32 a = 1;
@@ -9869,35 +9867,35 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
         }
         
-        public static self::TestDupFieldNumber.Types.Bar ParseFrom(pb::ByteString data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar ParseFrom(pb::ByteString data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Bar ParseFrom(pb::ByteString data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar ParseFrom(pb::ByteString data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Bar ParseFrom(byte[] data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar ParseFrom(byte[] data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Bar ParseFrom(byte[] data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar ParseFrom(byte[] data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Bar ParseFrom(global::System.IO.Stream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar ParseFrom(global::System.IO.Stream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Bar ParseFrom(
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar ParseFrom(
             global::System.IO.Stream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Bar ParseFrom(pb::CodedInputStream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar ParseFrom(pb::CodedInputStream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestDupFieldNumber.Types.Bar ParseFrom(pb::CodedInputStream input,
+        public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar ParseFrom(pb::CodedInputStream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
@@ -9905,26 +9903,26 @@ namespace Google.ProtocolBuffers.TestProtos {
         
         public static Builder CreateBuilder() { return new Builder(); }
         public override Builder CreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder(self::TestDupFieldNumber.Types.Bar prototype) {
+        public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar prototype) {
           return (Builder) new Builder().MergeFrom(prototype);
         }
         
-        public sealed partial class Builder : pb::GeneratedBuilder<self::TestDupFieldNumber.Types.Bar, Builder> {
+        public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar, Builder> {
           protected override Builder ThisBuilder {
             get { return this; }
           }
           
-          // Construct using self::TestDupFieldNumber.Types.Bar.CreateBuilder()
+          // Construct using global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.CreateBuilder()
           internal Builder() {}
           
-          self::TestDupFieldNumber.Types.Bar result = new self::TestDupFieldNumber.Types.Bar();
+          global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar result = new global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar();
           
-          protected override self::TestDupFieldNumber.Types.Bar MessageBeingBuilt {
+          protected override global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar MessageBeingBuilt {
             get { return result; }
           }
           
           public override Builder Clear() {
-            result = new self::TestDupFieldNumber.Types.Bar();
+            result = new global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar();
             return this;
           }
           
@@ -9933,30 +9931,30 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return self::TestDupFieldNumber.Types.Bar.Descriptor; }
+            get { return global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.Descriptor; }
           }
           
-          public override self::TestDupFieldNumber.Types.Bar DefaultInstanceForType {
-            get { return self::TestDupFieldNumber.Types.Bar.DefaultInstance; }
+          public override global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar DefaultInstanceForType {
+            get { return global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.DefaultInstance; }
           }
           
-          public override self::TestDupFieldNumber.Types.Bar BuildPartial() {
-            self::TestDupFieldNumber.Types.Bar returnMe = result;
+          public override global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar BuildPartial() {
+            global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar returnMe = result;
             result = null;
             return returnMe;
           }
           
           public override Builder MergeFrom(pb::IMessage other) {
-            if (other is self::TestDupFieldNumber.Types.Bar) {
-              return MergeFrom((self::TestDupFieldNumber.Types.Bar) other);
+            if (other is global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar) {
+              return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar) other);
             } else {
               base.MergeFrom(other);
               return this;
             }
           }
           
-          public override Builder MergeFrom(self::TestDupFieldNumber.Types.Bar other) {
-            if (other == self::TestDupFieldNumber.Types.Bar.DefaultInstance) return this;
+          public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar other) {
+            if (other == global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.DefaultInstance) return this;
             if (other.HasA) {
               A = other.A;
             }
@@ -10030,21 +10028,21 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     // optional group Foo = 2 {
     private bool hasFoo;
-    private self::TestDupFieldNumber.Types.Foo foo_ = self::TestDupFieldNumber.Types.Foo.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo foo_ = global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.DefaultInstance;
     public bool HasFoo {
       get { return hasFoo; }
     }
-    public self::TestDupFieldNumber.Types.Foo Foo {
+    public global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo Foo {
       get { return foo_; }
     }
     
     // optional group Bar = 3 {
     private bool hasBar;
-    private self::TestDupFieldNumber.Types.Bar bar_ = self::TestDupFieldNumber.Types.Bar.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar bar_ = global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.DefaultInstance;
     public bool HasBar {
       get { return hasBar; }
     }
-    public self::TestDupFieldNumber.Types.Bar Bar {
+    public global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar Bar {
       get { return bar_; }
     }
     
@@ -10089,35 +10087,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestDupFieldNumber ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestDupFieldNumber ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestDupFieldNumber ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestDupFieldNumber ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestDupFieldNumber ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestDupFieldNumber ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestDupFieldNumber ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestDupFieldNumber ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -10125,26 +10123,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestDupFieldNumber prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestDupFieldNumber, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestDupFieldNumber.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.CreateBuilder()
       internal Builder() {}
       
-      self::TestDupFieldNumber result = new self::TestDupFieldNumber();
+      global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber result = new global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber();
       
-      protected override self::TestDupFieldNumber MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestDupFieldNumber();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber();
         return this;
       }
       
@@ -10153,30 +10151,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestDupFieldNumber.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Descriptor; }
       }
       
-      public override self::TestDupFieldNumber DefaultInstanceForType {
-        get { return self::TestDupFieldNumber.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.DefaultInstance; }
       }
       
-      public override self::TestDupFieldNumber BuildPartial() {
-        self::TestDupFieldNumber returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestDupFieldNumber) {
-          return MergeFrom((self::TestDupFieldNumber) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestDupFieldNumber other) {
-        if (other == self::TestDupFieldNumber.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.DefaultInstance) return this;
         if (other.HasA) {
           A = other.A;
         }
@@ -10216,7 +10214,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 19: {
-              self::TestDupFieldNumber.Types.Foo.Builder subBuilder = self::TestDupFieldNumber.Types.Foo.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.CreateBuilder();
               if (HasFoo) {
                 subBuilder.MergeFrom(Foo);
               }
@@ -10225,7 +10223,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 27: {
-              self::TestDupFieldNumber.Types.Bar.Builder subBuilder = self::TestDupFieldNumber.Types.Bar.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.CreateBuilder();
               if (HasBar) {
                 subBuilder.MergeFrom(Bar);
               }
@@ -10261,25 +10259,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasFoo {
         get { return result.HasFoo; }
       }
-      public self::TestDupFieldNumber.Types.Foo Foo {
+      public global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo Foo {
         get { return result.Foo; }
         set { SetFoo(value); }
       }
-      public Builder SetFoo(self::TestDupFieldNumber.Types.Foo value) {
+      public Builder SetFoo(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo value) {
         result.hasFoo = true;
         result.foo_ = value;
         return this;
       }
-      public Builder SetFoo(self::TestDupFieldNumber.Types.Foo.Builder builderForValue) {
+      public Builder SetFoo(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.Builder builderForValue) {
         result.hasFoo = true;
         result.foo_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeFoo(self::TestDupFieldNumber.Types.Foo value) {
+      public Builder MergeFoo(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo value) {
         if (result.HasFoo &&
-            result.foo_ != self::TestDupFieldNumber.Types.Foo.DefaultInstance) {
+            result.foo_ != global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.DefaultInstance) {
           result.foo_ =
-            self::TestDupFieldNumber.Types.Foo.CreateBuilder(result.foo_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.CreateBuilder(result.foo_).MergeFrom(value).BuildPartial();
         } else {
           result.foo_ = value;
         }
@@ -10288,7 +10286,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearFoo() {
         result.hasFoo = false;
-        result.foo_ = self::TestDupFieldNumber.Types.Foo.DefaultInstance;
+        result.foo_ = global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Foo.DefaultInstance;
         return this;
       }
       
@@ -10296,25 +10294,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasBar {
         get { return result.HasBar; }
       }
-      public self::TestDupFieldNumber.Types.Bar Bar {
+      public global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar Bar {
         get { return result.Bar; }
         set { SetBar(value); }
       }
-      public Builder SetBar(self::TestDupFieldNumber.Types.Bar value) {
+      public Builder SetBar(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar value) {
         result.hasBar = true;
         result.bar_ = value;
         return this;
       }
-      public Builder SetBar(self::TestDupFieldNumber.Types.Bar.Builder builderForValue) {
+      public Builder SetBar(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.Builder builderForValue) {
         result.hasBar = true;
         result.bar_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeBar(self::TestDupFieldNumber.Types.Bar value) {
+      public Builder MergeBar(global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar value) {
         if (result.HasBar &&
-            result.bar_ != self::TestDupFieldNumber.Types.Bar.DefaultInstance) {
+            result.bar_ != global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.DefaultInstance) {
           result.bar_ =
-            self::TestDupFieldNumber.Types.Bar.CreateBuilder(result.bar_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.CreateBuilder(result.bar_).MergeFrom(value).BuildPartial();
         } else {
           result.bar_ = value;
         }
@@ -10323,7 +10321,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearBar() {
         result.hasBar = false;
-        result.bar_ = self::TestDupFieldNumber.Types.Bar.DefaultInstance;
+        result.bar_ = global::Google.ProtocolBuffers.TestProtos.TestDupFieldNumber.Types.Bar.DefaultInstance;
         return this;
       }
     }
@@ -10340,11 +10338,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestNestedMessageHasBits__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestNestedMessageHasBits__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestNestedMessageHasBits__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestNestedMessageHasBits__FieldAccessorTable; }
     }
     
     #region Nested types
@@ -10360,11 +10358,11 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         
         public static pbd::MessageDescriptor Descriptor {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestNestedMessageHasBits_NestedMessage__Descriptor; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestNestedMessageHasBits_NestedMessage__Descriptor; }
         }
         
         protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-          get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestNestedMessageHasBits_NestedMessage__FieldAccessorTable; }
+          get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestNestedMessageHasBits_NestedMessage__FieldAccessorTable; }
         }
         
         // repeated int32 nestedmessage_repeated_int32 = 1;
@@ -10380,14 +10378,14 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         
         // repeated .protobuf_unittest.ForeignMessage nestedmessage_repeated_foreignmessage = 2;
-        private scg::IList<self::ForeignMessage> nestedmessageRepeatedForeignmessage_ = pbc::Lists<self::ForeignMessage>.Empty;
-        public scg::IList<self::ForeignMessage> NestedmessageRepeatedForeignmessageList {
+        private scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> nestedmessageRepeatedForeignmessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty;
+        public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> NestedmessageRepeatedForeignmessageList {
           get { return nestedmessageRepeatedForeignmessage_; } 
         }
         public int NestedmessageRepeatedForeignmessageCount
           { get { return nestedmessageRepeatedForeignmessage_.Count; }
         }
-        public self::ForeignMessage GetNestedmessageRepeatedForeignmessage(int index) {
+        public global::Google.ProtocolBuffers.TestProtos.ForeignMessage GetNestedmessageRepeatedForeignmessage(int index) {
           return nestedmessageRepeatedForeignmessage_ [index];
         }
         
@@ -10401,7 +10399,7 @@ namespace Google.ProtocolBuffers.TestProtos {
           foreach (int element in NestedmessageRepeatedInt32List) {
             output.WriteInt32(1, element);
           }
-          foreach (self::ForeignMessage element in NestedmessageRepeatedForeignmessageList) {
+          foreach (global::Google.ProtocolBuffers.TestProtos.ForeignMessage element in NestedmessageRepeatedForeignmessageList) {
             output.WriteMessage(2, element);
           }
           UnknownFields.WriteTo(output);
@@ -10418,7 +10416,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               size += pb::CodedOutputStream
                 .ComputeInt32Size(1, element);
             }
-            foreach (self::ForeignMessage element in NestedmessageRepeatedForeignmessageList) {
+            foreach (global::Google.ProtocolBuffers.TestProtos.ForeignMessage element in NestedmessageRepeatedForeignmessageList) {
               size += pb::CodedOutputStream.ComputeMessageSize(2, element);
             }
             size += UnknownFields.SerializedSize;
@@ -10427,35 +10425,35 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
         }
         
-        public static self::TestNestedMessageHasBits.Types.NestedMessage ParseFrom(pb::ByteString data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage ParseFrom(pb::ByteString data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestNestedMessageHasBits.Types.NestedMessage ParseFrom(pb::ByteString data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage ParseFrom(pb::ByteString data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestNestedMessageHasBits.Types.NestedMessage ParseFrom(byte[] data) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage ParseFrom(byte[] data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::TestNestedMessageHasBits.Types.NestedMessage ParseFrom(byte[] data,
+        public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage ParseFrom(byte[] data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestNestedMessageHasBits.Types.NestedMessage ParseFrom(global::System.IO.Stream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage ParseFrom(global::System.IO.Stream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestNestedMessageHasBits.Types.NestedMessage ParseFrom(
+        public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage ParseFrom(
             global::System.IO.Stream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::TestNestedMessageHasBits.Types.NestedMessage ParseFrom(pb::CodedInputStream input) {
+        public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage ParseFrom(pb::CodedInputStream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::TestNestedMessageHasBits.Types.NestedMessage ParseFrom(pb::CodedInputStream input,
+        public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage ParseFrom(pb::CodedInputStream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
@@ -10463,26 +10461,26 @@ namespace Google.ProtocolBuffers.TestProtos {
         
         public static Builder CreateBuilder() { return new Builder(); }
         public override Builder CreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder(self::TestNestedMessageHasBits.Types.NestedMessage prototype) {
+        public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage prototype) {
           return (Builder) new Builder().MergeFrom(prototype);
         }
         
-        public sealed partial class Builder : pb::GeneratedBuilder<self::TestNestedMessageHasBits.Types.NestedMessage, Builder> {
+        public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage, Builder> {
           protected override Builder ThisBuilder {
             get { return this; }
           }
           
-          // Construct using self::TestNestedMessageHasBits.Types.NestedMessage.CreateBuilder()
+          // Construct using global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.CreateBuilder()
           internal Builder() {}
           
-          self::TestNestedMessageHasBits.Types.NestedMessage result = new self::TestNestedMessageHasBits.Types.NestedMessage();
+          global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage result = new global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage();
           
-          protected override self::TestNestedMessageHasBits.Types.NestedMessage MessageBeingBuilt {
+          protected override global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage MessageBeingBuilt {
             get { return result; }
           }
           
           public override Builder Clear() {
-            result = new self::TestNestedMessageHasBits.Types.NestedMessage();
+            result = new global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage();
             return this;
           }
           
@@ -10491,34 +10489,34 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return self::TestNestedMessageHasBits.Types.NestedMessage.Descriptor; }
+            get { return global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.Descriptor; }
           }
           
-          public override self::TestNestedMessageHasBits.Types.NestedMessage DefaultInstanceForType {
-            get { return self::TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance; }
+          public override global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage DefaultInstanceForType {
+            get { return global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance; }
           }
           
-          public override self::TestNestedMessageHasBits.Types.NestedMessage BuildPartial() {
+          public override global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage BuildPartial() {
             result.nestedmessageRepeatedInt32_ = pbc::Lists<int>.AsReadOnly(result.nestedmessageRepeatedInt32_);
-            if (result.nestedmessageRepeatedForeignmessage_ != pbc::Lists<self::ForeignMessage>.Empty) {
-              result.nestedmessageRepeatedForeignmessage_ = pbc::Lists<self::ForeignMessage>.AsReadOnly(result.nestedmessageRepeatedForeignmessage_);
+            if (result.nestedmessageRepeatedForeignmessage_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+              result.nestedmessageRepeatedForeignmessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.AsReadOnly(result.nestedmessageRepeatedForeignmessage_);
             }
-            self::TestNestedMessageHasBits.Types.NestedMessage returnMe = result;
+            global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage returnMe = result;
             result = null;
             return returnMe;
           }
           
           public override Builder MergeFrom(pb::IMessage other) {
-            if (other is self::TestNestedMessageHasBits.Types.NestedMessage) {
-              return MergeFrom((self::TestNestedMessageHasBits.Types.NestedMessage) other);
+            if (other is global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage) {
+              return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage) other);
             } else {
               base.MergeFrom(other);
               return this;
             }
           }
           
-          public override Builder MergeFrom(self::TestNestedMessageHasBits.Types.NestedMessage other) {
-            if (other == self::TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance) return this;
+          public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage other) {
+            if (other == global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance) return this;
             if (other.nestedmessageRepeatedInt32_.Count != 0) {
               if (result.nestedmessageRepeatedInt32_.Count == 0) {
                 result.nestedmessageRepeatedInt32_ = new scg::List<int>();
@@ -10527,7 +10525,7 @@ namespace Google.ProtocolBuffers.TestProtos {
             }
             if (other.nestedmessageRepeatedForeignmessage_.Count != 0) {
               if (result.nestedmessageRepeatedForeignmessage_.Count == 0) {
-                result.nestedmessageRepeatedForeignmessage_ = new scg::List<self::ForeignMessage>();
+                result.nestedmessageRepeatedForeignmessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
               }
               base.AddRange(other.nestedmessageRepeatedForeignmessage_, result.nestedmessageRepeatedForeignmessage_);
             }
@@ -10561,7 +10559,7 @@ namespace Google.ProtocolBuffers.TestProtos {
                   break;
                 }
                 case 18: {
-                  self::ForeignMessage.Builder subBuilder = self::ForeignMessage.CreateBuilder();
+                  global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder();
                   input.ReadMessage(subBuilder, extensionRegistry);
                   AddNestedmessageRepeatedForeignmessage(subBuilder.BuildPartial());
                   break;
@@ -10605,46 +10603,46 @@ namespace Google.ProtocolBuffers.TestProtos {
           }
           
           // repeated .protobuf_unittest.ForeignMessage nestedmessage_repeated_foreignmessage = 2;
-          public scg::IList<self::ForeignMessage> NestedmessageRepeatedForeignmessageList {
+          public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> NestedmessageRepeatedForeignmessageList {
             get { return pbc::Lists.AsReadOnly(result.nestedmessageRepeatedForeignmessage_); }
           }
           public int NestedmessageRepeatedForeignmessageCount {
             get { return result.NestedmessageRepeatedForeignmessageCount; }
           }
-          public self::ForeignMessage GetNestedmessageRepeatedForeignmessage(int index) {
+          public global::Google.ProtocolBuffers.TestProtos.ForeignMessage GetNestedmessageRepeatedForeignmessage(int index) {
             return result.GetNestedmessageRepeatedForeignmessage(index);
           }
-          public Builder SetNestedmessageRepeatedForeignmessage(int index, self::ForeignMessage value) {
+          public Builder SetNestedmessageRepeatedForeignmessage(int index, global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
             result.nestedmessageRepeatedForeignmessage_[index] = value;
             return this;
           }
-          public Builder SetNestedmessageRepeatedForeignmessage(int index, self::ForeignMessage.Builder builderForValue) {
+          public Builder SetNestedmessageRepeatedForeignmessage(int index, global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) {
             result.nestedmessageRepeatedForeignmessage_[index] = builderForValue.Build();
             return this;
           }
-          public Builder AddNestedmessageRepeatedForeignmessage(self::ForeignMessage value) {
-            if (result.nestedmessageRepeatedForeignmessage_ == pbc::Lists<self::ForeignMessage>.Empty) {
-              result.nestedmessageRepeatedForeignmessage_ = new scg::List<self::ForeignMessage>();
+          public Builder AddNestedmessageRepeatedForeignmessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
+            if (result.nestedmessageRepeatedForeignmessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+              result.nestedmessageRepeatedForeignmessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
             }
             result.nestedmessageRepeatedForeignmessage_.Add(value);
             return this;
           }
-          public Builder AddNestedmessageRepeatedForeignmessage(self::ForeignMessage.Builder builderForValue) {
-            if (result.nestedmessageRepeatedForeignmessage_ == pbc::Lists<self::ForeignMessage>.Empty) {
-              result.nestedmessageRepeatedForeignmessage_ = new scg::List<self::ForeignMessage>();
+          public Builder AddNestedmessageRepeatedForeignmessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) {
+            if (result.nestedmessageRepeatedForeignmessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+              result.nestedmessageRepeatedForeignmessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
             }
             result.nestedmessageRepeatedForeignmessage_.Add(builderForValue.Build());
             return this;
           }
-          public Builder AddRangeNestedmessageRepeatedForeignmessage(scg::IEnumerable<self::ForeignMessage> values) {
-            if (result.nestedmessageRepeatedForeignmessage_ == pbc::Lists<self::ForeignMessage>.Empty) {
-              result.nestedmessageRepeatedForeignmessage_ = new scg::List<self::ForeignMessage>();
+          public Builder AddRangeNestedmessageRepeatedForeignmessage(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> values) {
+            if (result.nestedmessageRepeatedForeignmessage_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+              result.nestedmessageRepeatedForeignmessage_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
             }
             base.AddRange(values, result.nestedmessageRepeatedForeignmessage_);
             return this;
           }
           public Builder ClearNestedmessageRepeatedForeignmessage() {
-            result.nestedmessageRepeatedForeignmessage_ = pbc::Lists<self::ForeignMessage>.Empty;
+            result.nestedmessageRepeatedForeignmessage_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty;
             return this;
           }
         }
@@ -10655,11 +10653,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     // optional .protobuf_unittest.TestNestedMessageHasBits.NestedMessage optional_nested_message = 1;
     private bool hasOptionalNestedMessage;
-    private self::TestNestedMessageHasBits.Types.NestedMessage optionalNestedMessage_ = self::TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage optionalNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance;
     public bool HasOptionalNestedMessage {
       get { return hasOptionalNestedMessage; }
     }
-    public self::TestNestedMessageHasBits.Types.NestedMessage OptionalNestedMessage {
+    public global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage OptionalNestedMessage {
       get { return optionalNestedMessage_; }
     }
     
@@ -10692,35 +10690,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestNestedMessageHasBits ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestNestedMessageHasBits ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestNestedMessageHasBits ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestNestedMessageHasBits ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestNestedMessageHasBits ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestNestedMessageHasBits ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestNestedMessageHasBits ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestNestedMessageHasBits ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -10728,26 +10726,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestNestedMessageHasBits prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestNestedMessageHasBits, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestNestedMessageHasBits.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.CreateBuilder()
       internal Builder() {}
       
-      self::TestNestedMessageHasBits result = new self::TestNestedMessageHasBits();
+      global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits result = new global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits();
       
-      protected override self::TestNestedMessageHasBits MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestNestedMessageHasBits();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits();
         return this;
       }
       
@@ -10756,30 +10754,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestNestedMessageHasBits.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Descriptor; }
       }
       
-      public override self::TestNestedMessageHasBits DefaultInstanceForType {
-        get { return self::TestNestedMessageHasBits.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.DefaultInstance; }
       }
       
-      public override self::TestNestedMessageHasBits BuildPartial() {
-        self::TestNestedMessageHasBits returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestNestedMessageHasBits) {
-          return MergeFrom((self::TestNestedMessageHasBits) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestNestedMessageHasBits other) {
-        if (other == self::TestNestedMessageHasBits.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.DefaultInstance) return this;
         if (other.HasOptionalNestedMessage) {
           MergeOptionalNestedMessage(other.OptionalNestedMessage);
         }
@@ -10809,7 +10807,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 10: {
-              self::TestNestedMessageHasBits.Types.NestedMessage.Builder subBuilder = self::TestNestedMessageHasBits.Types.NestedMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.CreateBuilder();
               if (HasOptionalNestedMessage) {
                 subBuilder.MergeFrom(OptionalNestedMessage);
               }
@@ -10826,25 +10824,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasOptionalNestedMessage {
         get { return result.HasOptionalNestedMessage; }
       }
-      public self::TestNestedMessageHasBits.Types.NestedMessage OptionalNestedMessage {
+      public global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage OptionalNestedMessage {
         get { return result.OptionalNestedMessage; }
         set { SetOptionalNestedMessage(value); }
       }
-      public Builder SetOptionalNestedMessage(self::TestNestedMessageHasBits.Types.NestedMessage value) {
+      public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage value) {
         result.hasOptionalNestedMessage = true;
         result.optionalNestedMessage_ = value;
         return this;
       }
-      public Builder SetOptionalNestedMessage(self::TestNestedMessageHasBits.Types.NestedMessage.Builder builderForValue) {
+      public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.Builder builderForValue) {
         result.hasOptionalNestedMessage = true;
         result.optionalNestedMessage_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptionalNestedMessage(self::TestNestedMessageHasBits.Types.NestedMessage value) {
+      public Builder MergeOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage value) {
         if (result.HasOptionalNestedMessage &&
-            result.optionalNestedMessage_ != self::TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance) {
+            result.optionalNestedMessage_ != global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance) {
           result.optionalNestedMessage_ =
-            self::TestNestedMessageHasBits.Types.NestedMessage.CreateBuilder(result.optionalNestedMessage_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.CreateBuilder(result.optionalNestedMessage_).MergeFrom(value).BuildPartial();
         } else {
           result.optionalNestedMessage_ = value;
         }
@@ -10853,7 +10851,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearOptionalNestedMessage() {
         result.hasOptionalNestedMessage = false;
-        result.optionalNestedMessage_ = self::TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance;
+        result.optionalNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.TestNestedMessageHasBits.Types.NestedMessage.DefaultInstance;
         return this;
       }
     }
@@ -10870,11 +10868,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestCamelCaseFieldNames__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestCamelCaseFieldNames__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestCamelCaseFieldNames__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestCamelCaseFieldNames__FieldAccessorTable; }
     }
     
     // optional int32 PrimitiveField = 1;
@@ -10899,19 +10897,19 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     // optional .protobuf_unittest.ForeignEnum EnumField = 3;
     private bool hasEnumField;
-    private self::ForeignEnum enumField_ = self::ForeignEnum.FOREIGN_FOO;
+    private global::Google.ProtocolBuffers.TestProtos.ForeignEnum enumField_ = global::Google.ProtocolBuffers.TestProtos.ForeignEnum.FOREIGN_FOO;
     public bool HasEnumField {
       get { return hasEnumField; }
     }
-    public self::ForeignEnum EnumField {  get { return enumField_; }}
+    public global::Google.ProtocolBuffers.TestProtos.ForeignEnum EnumField {  get { return enumField_; }}
     
     // optional .protobuf_unittest.ForeignMessage MessageField = 4;
     private bool hasMessageField;
-    private self::ForeignMessage messageField_ = self::ForeignMessage.DefaultInstance;
+    private global::Google.ProtocolBuffers.TestProtos.ForeignMessage messageField_ = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance;
     public bool HasMessageField {
       get { return hasMessageField; }
     }
-    public self::ForeignMessage MessageField {
+    public global::Google.ProtocolBuffers.TestProtos.ForeignMessage MessageField {
       get { return messageField_; }
     }
     
@@ -10960,26 +10958,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     // repeated .protobuf_unittest.ForeignEnum RepeatedEnumField = 9;
-    private scg::IList<self::ForeignEnum> repeatedEnumField_ = new scg::List<self::ForeignEnum> ();
-    public scg.IList<self::ForeignEnum> RepeatedEnumFieldList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> repeatedEnumField_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> ();
+    public scg.IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedEnumFieldList {
       get { return pbc::Lists.AsReadOnly(repeatedEnumField_); }
     }
     public int RepeatedEnumFieldCount {
       get { return repeatedEnumField_.Count; }
     }
-    public self::ForeignEnum GetRepeatedEnumField(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.ForeignEnum GetRepeatedEnumField(int index) {
       return repeatedEnumField_[index];
     }
     
     // repeated .protobuf_unittest.ForeignMessage RepeatedMessageField = 10;
-    private scg::IList<self::ForeignMessage> repeatedMessageField_ = pbc::Lists<self::ForeignMessage>.Empty;
-    public scg::IList<self::ForeignMessage> RepeatedMessageFieldList {
+    private scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> repeatedMessageField_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedMessageFieldList {
       get { return repeatedMessageField_; } 
     }
     public int RepeatedMessageFieldCount
       { get { return repeatedMessageField_.Count; }
     }
-    public self::ForeignMessage GetRepeatedMessageField(int index) {
+    public global::Google.ProtocolBuffers.TestProtos.ForeignMessage GetRepeatedMessageField(int index) {
       return repeatedMessageField_ [index];
     }
     
@@ -11038,10 +11036,10 @@ namespace Google.ProtocolBuffers.TestProtos {
       foreach (string element in RepeatedStringFieldList) {
         output.WriteString(8, element);
       }
-      foreach (self::ForeignEnum element in RepeatedEnumFieldList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.ForeignEnum element in RepeatedEnumFieldList) {
         output.WriteEnum(9, (int) element);
       }
-      foreach (self::ForeignMessage element in RepeatedMessageFieldList) {
+      foreach (global::Google.ProtocolBuffers.TestProtos.ForeignMessage element in RepeatedMessageFieldList) {
         output.WriteMessage(10, element);
       }
       foreach (string element in RepeatedStringPieceFieldList) {
@@ -11087,11 +11085,11 @@ namespace Google.ProtocolBuffers.TestProtos {
           size += pb::CodedOutputStream
             .ComputeStringSize(8, element);
         }
-        foreach (self::ForeignEnum element in RepeatedEnumFieldList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.ForeignEnum element in RepeatedEnumFieldList) {
           size += pb::CodedOutputStream
             .ComputeEnumSize(9, (int) element);
         }
-        foreach (self::ForeignMessage element in RepeatedMessageFieldList) {
+        foreach (global::Google.ProtocolBuffers.TestProtos.ForeignMessage element in RepeatedMessageFieldList) {
           size += pb::CodedOutputStream.ComputeMessageSize(10, element);
         }
         foreach (string element in RepeatedStringPieceFieldList) {
@@ -11108,35 +11106,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestCamelCaseFieldNames ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestCamelCaseFieldNames ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestCamelCaseFieldNames ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestCamelCaseFieldNames ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestCamelCaseFieldNames ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestCamelCaseFieldNames ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestCamelCaseFieldNames ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestCamelCaseFieldNames ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -11144,26 +11142,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestCamelCaseFieldNames prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestCamelCaseFieldNames, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestCamelCaseFieldNames.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames.CreateBuilder()
       internal Builder() {}
       
-      self::TestCamelCaseFieldNames result = new self::TestCamelCaseFieldNames();
+      global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames result = new global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames();
       
-      protected override self::TestCamelCaseFieldNames MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestCamelCaseFieldNames();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames();
         return this;
       }
       
@@ -11172,38 +11170,38 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestCamelCaseFieldNames.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames.Descriptor; }
       }
       
-      public override self::TestCamelCaseFieldNames DefaultInstanceForType {
-        get { return self::TestCamelCaseFieldNames.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames.DefaultInstance; }
       }
       
-      public override self::TestCamelCaseFieldNames BuildPartial() {
+      public override global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames BuildPartial() {
         result.repeatedPrimitiveField_ = pbc::Lists<int>.AsReadOnly(result.repeatedPrimitiveField_);
         result.repeatedStringField_ = pbc::Lists<string>.AsReadOnly(result.repeatedStringField_);
         result.repeatedEnumField_ = pbc::Lists.AsReadOnly(result.repeatedEnumField_);
-        if (result.repeatedMessageField_ != pbc::Lists<self::ForeignMessage>.Empty) {
-          result.repeatedMessageField_ = pbc::Lists<self::ForeignMessage>.AsReadOnly(result.repeatedMessageField_);
+        if (result.repeatedMessageField_ != pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+          result.repeatedMessageField_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.AsReadOnly(result.repeatedMessageField_);
         }
         result.repeatedStringPieceField_ = pbc::Lists<string>.AsReadOnly(result.repeatedStringPieceField_);
         result.repeatedCordField_ = pbc::Lists<string>.AsReadOnly(result.repeatedCordField_);
-        self::TestCamelCaseFieldNames returnMe = result;
+        global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestCamelCaseFieldNames) {
-          return MergeFrom((self::TestCamelCaseFieldNames) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestCamelCaseFieldNames other) {
-        if (other == self::TestCamelCaseFieldNames.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestCamelCaseFieldNames.DefaultInstance) return this;
         if (other.HasPrimitiveField) {
           PrimitiveField = other.PrimitiveField;
         }
@@ -11236,13 +11234,13 @@ namespace Google.ProtocolBuffers.TestProtos {
         }
         if (other.repeatedEnumField_.Count != 0) {
           if (result.repeatedEnumField_.Count == 0) {
-            result.repeatedEnumField_ = new scg::List<self::ForeignEnum>();
+            result.repeatedEnumField_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>();
           }
           base.AddRange(other.repeatedEnumField_, result.repeatedEnumField_);
         }
         if (other.repeatedMessageField_.Count != 0) {
           if (result.repeatedMessageField_.Count == 0) {
-            result.repeatedMessageField_ = new scg::List<self::ForeignMessage>();
+            result.repeatedMessageField_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
           }
           base.AddRange(other.repeatedMessageField_, result.repeatedMessageField_);
         }
@@ -11293,15 +11291,15 @@ namespace Google.ProtocolBuffers.TestProtos {
             }
             case 24: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::ForeignEnum), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.ForeignEnum), rawValue)) {
                 unknownFields.MergeVarintField(3, (ulong) rawValue);
               } else {
-                EnumField = (self::ForeignEnum) rawValue;
+                EnumField = (global::Google.ProtocolBuffers.TestProtos.ForeignEnum) rawValue;
               }
               break;
             }
             case 34: {
-              self::ForeignMessage.Builder subBuilder = self::ForeignMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder();
               if (HasMessageField) {
                 subBuilder.MergeFrom(MessageField);
               }
@@ -11327,8 +11325,8 @@ namespace Google.ProtocolBuffers.TestProtos {
             }
             case 72: {
               int rawValue = input.ReadEnum();
-              self::ForeignEnum value = (self::ForeignEnum) rawValue;
-              if (!global::System.Enum.IsDefined(typeof(self::ForeignEnum), value)) {
+              global::Google.ProtocolBuffers.TestProtos.ForeignEnum value = (global::Google.ProtocolBuffers.TestProtos.ForeignEnum) rawValue;
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.TestProtos.ForeignEnum), value)) {
                 unknownFields.MergeVarintField(9, (ulong) rawValue);
               } else {
                 AddRepeatedEnumField(value);
@@ -11336,7 +11334,7 @@ namespace Google.ProtocolBuffers.TestProtos {
               break;
             }
             case 82: {
-              self::ForeignMessage.Builder subBuilder = self::ForeignMessage.CreateBuilder();
+              global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddRepeatedMessageField(subBuilder.BuildPartial());
               break;
@@ -11396,18 +11394,18 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasEnumField {
         get { return result.HasEnumField; }
       }
-      public self::ForeignEnum EnumField {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignEnum EnumField {
         get { return result.EnumField; }
         set { SetEnumField(value); }
       }
-      public Builder SetEnumField(self::ForeignEnum value) {
+      public Builder SetEnumField(global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) {
         result.hasEnumField = true;
         result.enumField_ = value;
         return this;
       }
       public Builder ClearEnumField() {
         result.hasEnumField = false;
-        result.enumField_ = self::ForeignEnum.FOREIGN_FOO;
+        result.enumField_ = global::Google.ProtocolBuffers.TestProtos.ForeignEnum.FOREIGN_FOO;
         return this;
       }
       
@@ -11415,25 +11413,25 @@ namespace Google.ProtocolBuffers.TestProtos {
       public bool HasMessageField {
         get { return result.HasMessageField; }
       }
-      public self::ForeignMessage MessageField {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignMessage MessageField {
         get { return result.MessageField; }
         set { SetMessageField(value); }
       }
-      public Builder SetMessageField(self::ForeignMessage value) {
+      public Builder SetMessageField(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
         result.hasMessageField = true;
         result.messageField_ = value;
         return this;
       }
-      public Builder SetMessageField(self::ForeignMessage.Builder builderForValue) {
+      public Builder SetMessageField(global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) {
         result.hasMessageField = true;
         result.messageField_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeMessageField(self::ForeignMessage value) {
+      public Builder MergeMessageField(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
         if (result.HasMessageField &&
-            result.messageField_ != self::ForeignMessage.DefaultInstance) {
+            result.messageField_ != global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance) {
           result.messageField_ =
-            self::ForeignMessage.CreateBuilder(result.messageField_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder(result.messageField_).MergeFrom(value).BuildPartial();
         } else {
           result.messageField_ = value;
         }
@@ -11442,7 +11440,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearMessageField() {
         result.hasMessageField = false;
-        result.messageField_ = self::ForeignMessage.DefaultInstance;
+        result.messageField_ = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance;
         return this;
       }
       
@@ -11551,79 +11549,79 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       // repeated .protobuf_unittest.ForeignEnum RepeatedEnumField = 9;
-      public scg::IList<self::ForeignEnum> RepeatedEnumFieldList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> RepeatedEnumFieldList {
         get { return pbc::Lists.AsReadOnly(result.repeatedEnumField_); }
       }
       public int RepeatedEnumFieldCount {
         get { return result.RepeatedEnumFieldCount; } 
       }
-      public self::ForeignEnum GetRepeatedEnumField(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignEnum GetRepeatedEnumField(int index) {
         return result.GetRepeatedEnumField(index);
       }
-      public Builder SetRepeatedEnumField(int index, self::ForeignEnum value) {
+      public Builder SetRepeatedEnumField(int index, global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) {
         result.repeatedEnumField_[index] = value;
         return this;
       }
-      public Builder AddRepeatedEnumField(self::ForeignEnum value) {
+      public Builder AddRepeatedEnumField(global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) {
         if (result.repeatedEnumField_.Count == 0) {
-          result.repeatedEnumField_ = new scg::List<self::ForeignEnum>();
+          result.repeatedEnumField_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>();
         }
         result.repeatedEnumField_.Add(value);
         return this;
       }
-      public Builder AddRangeRepeatedEnumField(scg::IEnumerable<self::ForeignEnum> values) {
+      public Builder AddRangeRepeatedEnumField(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.ForeignEnum> values) {
         if (result.repeatedEnumField_.Count == 0) {
-          result.repeatedEnumField_ = new scg::List<self::ForeignEnum>();
+          result.repeatedEnumField_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>();
         }
         base.AddRange(values, result.repeatedEnumField_);
         return this;
       }
       public Builder ClearRepeatedEnumField() {
-        result.repeatedEnumField_ = pbc::Lists<self::ForeignEnum>.Empty;
+        result.repeatedEnumField_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignEnum>.Empty;
         return this;
       }
       
       // repeated .protobuf_unittest.ForeignMessage RepeatedMessageField = 10;
-      public scg::IList<self::ForeignMessage> RepeatedMessageFieldList {
+      public scg::IList<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> RepeatedMessageFieldList {
         get { return pbc::Lists.AsReadOnly(result.repeatedMessageField_); }
       }
       public int RepeatedMessageFieldCount {
         get { return result.RepeatedMessageFieldCount; }
       }
-      public self::ForeignMessage GetRepeatedMessageField(int index) {
+      public global::Google.ProtocolBuffers.TestProtos.ForeignMessage GetRepeatedMessageField(int index) {
         return result.GetRepeatedMessageField(index);
       }
-      public Builder SetRepeatedMessageField(int index, self::ForeignMessage value) {
+      public Builder SetRepeatedMessageField(int index, global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
         result.repeatedMessageField_[index] = value;
         return this;
       }
-      public Builder SetRepeatedMessageField(int index, self::ForeignMessage.Builder builderForValue) {
+      public Builder SetRepeatedMessageField(int index, global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) {
         result.repeatedMessageField_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddRepeatedMessageField(self::ForeignMessage value) {
-        if (result.repeatedMessageField_ == pbc::Lists<self::ForeignMessage>.Empty) {
-          result.repeatedMessageField_ = new scg::List<self::ForeignMessage>();
+      public Builder AddRepeatedMessageField(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) {
+        if (result.repeatedMessageField_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+          result.repeatedMessageField_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
         }
         result.repeatedMessageField_.Add(value);
         return this;
       }
-      public Builder AddRepeatedMessageField(self::ForeignMessage.Builder builderForValue) {
-        if (result.repeatedMessageField_ == pbc::Lists<self::ForeignMessage>.Empty) {
-          result.repeatedMessageField_ = new scg::List<self::ForeignMessage>();
+      public Builder AddRepeatedMessageField(global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) {
+        if (result.repeatedMessageField_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+          result.repeatedMessageField_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
         }
         result.repeatedMessageField_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeRepeatedMessageField(scg::IEnumerable<self::ForeignMessage> values) {
-        if (result.repeatedMessageField_ == pbc::Lists<self::ForeignMessage>.Empty) {
-          result.repeatedMessageField_ = new scg::List<self::ForeignMessage>();
+      public Builder AddRangeRepeatedMessageField(scg::IEnumerable<global::Google.ProtocolBuffers.TestProtos.ForeignMessage> values) {
+        if (result.repeatedMessageField_ == pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty) {
+          result.repeatedMessageField_ = new scg::List<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>();
         }
         base.AddRange(values, result.repeatedMessageField_);
         return this;
       }
       public Builder ClearRepeatedMessageField() {
-        result.repeatedMessageField_ = pbc::Lists<self::ForeignMessage>.Empty;
+        result.repeatedMessageField_ = pbc::Lists<global::Google.ProtocolBuffers.TestProtos.ForeignMessage>.Empty;
         return this;
       }
       
@@ -11706,11 +11704,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestFieldOrderings__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestFieldOrderings__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestFieldOrderings__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestFieldOrderings__FieldAccessorTable; }
     }
     
     // optional string my_string = 11;
@@ -11789,35 +11787,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestFieldOrderings ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestFieldOrderings ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestFieldOrderings ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestFieldOrderings ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestFieldOrderings ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestFieldOrderings ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestFieldOrderings ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestFieldOrderings ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -11825,26 +11823,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestFieldOrderings prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::ExtendableBuilder<self::TestFieldOrderings, self::TestFieldOrderings.Builder> {
+    public sealed partial class Builder : pb::ExtendableBuilder<global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings, global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings.Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestFieldOrderings.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings.CreateBuilder()
       internal Builder() {}
       
-      self::TestFieldOrderings result = new self::TestFieldOrderings();
+      global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings result = new global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings();
       
-      protected override self::TestFieldOrderings MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestFieldOrderings();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings();
         return this;
       }
       
@@ -11853,30 +11851,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestFieldOrderings.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings.Descriptor; }
       }
       
-      public override self::TestFieldOrderings DefaultInstanceForType {
-        get { return self::TestFieldOrderings.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings.DefaultInstance; }
       }
       
-      public override self::TestFieldOrderings BuildPartial() {
-        self::TestFieldOrderings returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestFieldOrderings) {
-          return MergeFrom((self::TestFieldOrderings) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestFieldOrderings other) {
-        if (other == self::TestFieldOrderings.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestFieldOrderings.DefaultInstance) return this;
         if (other.HasMyString) {
           MyString = other.MyString;
         }
@@ -11998,16 +11996,16 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestExtremeDefaultValues__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestExtremeDefaultValues__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_TestExtremeDefaultValues__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_TestExtremeDefaultValues__FieldAccessorTable; }
     }
     
     // optional bytes escaped_bytes = 1 [default = "\000\001\007\010\014\n\r\t\013\\\'\"\376"];
     private bool hasEscapedBytes;
-    private pb::ByteString escapedBytes_ = ((pb::ByteString) self::TestExtremeDefaultValues.Descriptor.Fields[0].DefaultValue);
+    private pb::ByteString escapedBytes_ = ((pb::ByteString) global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues.Descriptor.Fields[0].DefaultValue);
     public bool HasEscapedBytes {
       get { return hasEscapedBytes; }
     }
@@ -12057,7 +12055,7 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     // optional string utf8_string = 6 [default = "\341\210\264"];
     private bool hasUtf8String;
-    private string utf8String_ = ((string) self::TestExtremeDefaultValues.Descriptor.Fields[5].DefaultValue);
+    private string utf8String_ = ((string) global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues.Descriptor.Fields[5].DefaultValue);
     public bool HasUtf8String {
       get { return hasUtf8String; }
     }
@@ -12124,35 +12122,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::TestExtremeDefaultValues ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestExtremeDefaultValues ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestExtremeDefaultValues ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::TestExtremeDefaultValues ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestExtremeDefaultValues ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestExtremeDefaultValues ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::TestExtremeDefaultValues ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::TestExtremeDefaultValues ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -12160,26 +12158,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::TestExtremeDefaultValues prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::TestExtremeDefaultValues, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::TestExtremeDefaultValues.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues.CreateBuilder()
       internal Builder() {}
       
-      self::TestExtremeDefaultValues result = new self::TestExtremeDefaultValues();
+      global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues result = new global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues();
       
-      protected override self::TestExtremeDefaultValues MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::TestExtremeDefaultValues();
+        result = new global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues();
         return this;
       }
       
@@ -12188,30 +12186,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::TestExtremeDefaultValues.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues.Descriptor; }
       }
       
-      public override self::TestExtremeDefaultValues DefaultInstanceForType {
-        get { return self::TestExtremeDefaultValues.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues.DefaultInstance; }
       }
       
-      public override self::TestExtremeDefaultValues BuildPartial() {
-        self::TestExtremeDefaultValues returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::TestExtremeDefaultValues) {
-          return MergeFrom((self::TestExtremeDefaultValues) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::TestExtremeDefaultValues other) {
-        if (other == self::TestExtremeDefaultValues.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues.DefaultInstance) return this;
         if (other.HasEscapedBytes) {
           EscapedBytes = other.EscapedBytes;
         }
@@ -12299,7 +12297,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearEscapedBytes() {
         result.hasEscapedBytes = false;
-        result.escapedBytes_ = ((pb::ByteString) self::TestExtremeDefaultValues.Descriptor.Fields[0].DefaultValue);
+        result.escapedBytes_ = ((pb::ByteString) global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues.Descriptor.Fields[0].DefaultValue);
         return this;
       }
       
@@ -12394,7 +12392,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       public Builder ClearUtf8String() {
         result.hasUtf8String = false;
-        result.utf8String_ = ((string) self::TestExtremeDefaultValues.Descriptor.Fields[5].DefaultValue);
+        result.utf8String_ = ((string) global::Google.ProtocolBuffers.TestProtos.TestExtremeDefaultValues.Descriptor.Fields[5].DefaultValue);
         return this;
       }
     }
@@ -12411,11 +12409,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_FooRequest__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_FooRequest__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_FooRequest__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_FooRequest__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -12441,35 +12439,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::FooRequest ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.FooRequest ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FooRequest ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.FooRequest ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FooRequest ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.FooRequest ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FooRequest ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.FooRequest ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FooRequest ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.FooRequest ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FooRequest ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.FooRequest ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FooRequest ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.FooRequest ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FooRequest ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.FooRequest ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -12477,26 +12475,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::FooRequest prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.FooRequest prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::FooRequest, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.FooRequest, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::FooRequest.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.FooRequest.CreateBuilder()
       internal Builder() {}
       
-      self::FooRequest result = new self::FooRequest();
+      global::Google.ProtocolBuffers.TestProtos.FooRequest result = new global::Google.ProtocolBuffers.TestProtos.FooRequest();
       
-      protected override self::FooRequest MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.FooRequest MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::FooRequest();
+        result = new global::Google.ProtocolBuffers.TestProtos.FooRequest();
         return this;
       }
       
@@ -12505,30 +12503,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::FooRequest.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.FooRequest.Descriptor; }
       }
       
-      public override self::FooRequest DefaultInstanceForType {
-        get { return self::FooRequest.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.FooRequest DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.FooRequest.DefaultInstance; }
       }
       
-      public override self::FooRequest BuildPartial() {
-        self::FooRequest returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.FooRequest BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.FooRequest returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::FooRequest) {
-          return MergeFrom((self::FooRequest) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.FooRequest) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.FooRequest) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::FooRequest other) {
-        if (other == self::FooRequest.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.FooRequest other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.FooRequest.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -12572,11 +12570,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_FooResponse__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_FooResponse__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_FooResponse__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_FooResponse__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -12602,35 +12600,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::FooResponse ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.FooResponse ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FooResponse ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.FooResponse ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FooResponse ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.FooResponse ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FooResponse ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.FooResponse ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FooResponse ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.FooResponse ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FooResponse ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.FooResponse ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FooResponse ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.FooResponse ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FooResponse ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.FooResponse ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -12638,26 +12636,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::FooResponse prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.FooResponse prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::FooResponse, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.FooResponse, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::FooResponse.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.FooResponse.CreateBuilder()
       internal Builder() {}
       
-      self::FooResponse result = new self::FooResponse();
+      global::Google.ProtocolBuffers.TestProtos.FooResponse result = new global::Google.ProtocolBuffers.TestProtos.FooResponse();
       
-      protected override self::FooResponse MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.FooResponse MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::FooResponse();
+        result = new global::Google.ProtocolBuffers.TestProtos.FooResponse();
         return this;
       }
       
@@ -12666,30 +12664,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::FooResponse.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.FooResponse.Descriptor; }
       }
       
-      public override self::FooResponse DefaultInstanceForType {
-        get { return self::FooResponse.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.FooResponse DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.FooResponse.DefaultInstance; }
       }
       
-      public override self::FooResponse BuildPartial() {
-        self::FooResponse returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.FooResponse BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.FooResponse returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::FooResponse) {
-          return MergeFrom((self::FooResponse) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.FooResponse) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.FooResponse) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::FooResponse other) {
-        if (other == self::FooResponse.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.FooResponse other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.FooResponse.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -12733,11 +12731,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_BarRequest__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_BarRequest__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_BarRequest__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_BarRequest__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -12763,35 +12761,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::BarRequest ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.BarRequest ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::BarRequest ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.BarRequest ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::BarRequest ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.BarRequest ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::BarRequest ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.BarRequest ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::BarRequest ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.BarRequest ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::BarRequest ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.BarRequest ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::BarRequest ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.BarRequest ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::BarRequest ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.BarRequest ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -12799,26 +12797,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::BarRequest prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.BarRequest prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::BarRequest, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.BarRequest, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::BarRequest.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.BarRequest.CreateBuilder()
       internal Builder() {}
       
-      self::BarRequest result = new self::BarRequest();
+      global::Google.ProtocolBuffers.TestProtos.BarRequest result = new global::Google.ProtocolBuffers.TestProtos.BarRequest();
       
-      protected override self::BarRequest MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.BarRequest MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::BarRequest();
+        result = new global::Google.ProtocolBuffers.TestProtos.BarRequest();
         return this;
       }
       
@@ -12827,30 +12825,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::BarRequest.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.BarRequest.Descriptor; }
       }
       
-      public override self::BarRequest DefaultInstanceForType {
-        get { return self::BarRequest.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.BarRequest DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.BarRequest.DefaultInstance; }
       }
       
-      public override self::BarRequest BuildPartial() {
-        self::BarRequest returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.BarRequest BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.BarRequest returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::BarRequest) {
-          return MergeFrom((self::BarRequest) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.BarRequest) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.BarRequest) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::BarRequest other) {
-        if (other == self::BarRequest.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.BarRequest other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.BarRequest.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -12894,11 +12892,11 @@ namespace Google.ProtocolBuffers.TestProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_BarResponse__Descriptor; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_BarResponse__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::UnitTestProtoFile.internal__static_protobuf_unittest_BarResponse__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.internal__static_protobuf_unittest_BarResponse__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -12924,35 +12922,35 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
     }
     
-    public static self::BarResponse ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.TestProtos.BarResponse ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::BarResponse ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.TestProtos.BarResponse ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::BarResponse ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.TestProtos.BarResponse ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::BarResponse ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.TestProtos.BarResponse ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::BarResponse ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.BarResponse ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::BarResponse ParseFrom(
+    public static global::Google.ProtocolBuffers.TestProtos.BarResponse ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::BarResponse ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.TestProtos.BarResponse ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::BarResponse ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.TestProtos.BarResponse ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -12960,26 +12958,26 @@ namespace Google.ProtocolBuffers.TestProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::BarResponse prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.TestProtos.BarResponse prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::BarResponse, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.TestProtos.BarResponse, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::BarResponse.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.TestProtos.BarResponse.CreateBuilder()
       internal Builder() {}
       
-      self::BarResponse result = new self::BarResponse();
+      global::Google.ProtocolBuffers.TestProtos.BarResponse result = new global::Google.ProtocolBuffers.TestProtos.BarResponse();
       
-      protected override self::BarResponse MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.TestProtos.BarResponse MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::BarResponse();
+        result = new global::Google.ProtocolBuffers.TestProtos.BarResponse();
         return this;
       }
       
@@ -12988,30 +12986,30 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::BarResponse.Descriptor; }
+        get { return global::Google.ProtocolBuffers.TestProtos.BarResponse.Descriptor; }
       }
       
-      public override self::BarResponse DefaultInstanceForType {
-        get { return self::BarResponse.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.TestProtos.BarResponse DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.TestProtos.BarResponse.DefaultInstance; }
       }
       
-      public override self::BarResponse BuildPartial() {
-        self::BarResponse returnMe = result;
+      public override global::Google.ProtocolBuffers.TestProtos.BarResponse BuildPartial() {
+        global::Google.ProtocolBuffers.TestProtos.BarResponse returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::BarResponse) {
-          return MergeFrom((self::BarResponse) other);
+        if (other is global::Google.ProtocolBuffers.TestProtos.BarResponse) {
+          return MergeFrom((global::Google.ProtocolBuffers.TestProtos.BarResponse) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::BarResponse other) {
-        if (other == self::BarResponse.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.TestProtos.BarResponse other) {
+        if (other == global::Google.ProtocolBuffers.TestProtos.BarResponse.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -13050,15 +13048,15 @@ namespace Google.ProtocolBuffers.TestProtos {
   public abstract class TestService : pb::IService {
     public abstract void Foo(
         pb::IRpcController controller,
-        self::FooRequest request,
-        global::System.Action<self::FooResponse> done);
+        global::Google.ProtocolBuffers.TestProtos.FooRequest request,
+        global::System.Action<global::Google.ProtocolBuffers.TestProtos.FooResponse> done);
     public abstract void Bar(
         pb::IRpcController controller,
-        self::BarRequest request,
-        global::System.Action<self::BarResponse> done);
+        global::Google.ProtocolBuffers.TestProtos.BarRequest request,
+        global::System.Action<global::Google.ProtocolBuffers.TestProtos.BarResponse> done);
     
     public static pbd::ServiceDescriptor Descriptor {
-      get { return self::UnitTestProtoFile.Descriptor.Services[0]; }
+      get { return global::Google.ProtocolBuffers.TestProtos.UnitTestProtoFile.Descriptor.Services[0]; }
     }
     public pbd::ServiceDescriptor DescriptorForType {
       get { return Descriptor; }
@@ -13076,13 +13074,13 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       switch(method.Index) {
         case 0:
-          this.Foo(controller, (self::FooRequest)request,
-            pb::RpcUtil.SpecializeCallback<self::FooResponse>(
+          this.Foo(controller, (global::Google.ProtocolBuffers.TestProtos.FooRequest)request,
+            pb::RpcUtil.SpecializeCallback<global::Google.ProtocolBuffers.TestProtos.FooResponse>(
               done));
           return;
         case 1:
-          this.Bar(controller, (self::BarRequest)request,
-            pb::RpcUtil.SpecializeCallback<self::BarResponse>(
+          this.Bar(controller, (global::Google.ProtocolBuffers.TestProtos.BarRequest)request,
+            pb::RpcUtil.SpecializeCallback<global::Google.ProtocolBuffers.TestProtos.BarResponse>(
               done));
           return;
         default:
@@ -13098,9 +13096,9 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       switch(method.Index) {
         case 0:
-          return self::FooRequest.DefaultInstance;
+          return global::Google.ProtocolBuffers.TestProtos.FooRequest.DefaultInstance;
         case 1:
-          return self::BarRequest.DefaultInstance;
+          return global::Google.ProtocolBuffers.TestProtos.BarRequest.DefaultInstance;
         default:
           throw new global::System.ArgumentException("Can't get here.");
       }
@@ -13114,9 +13112,9 @@ namespace Google.ProtocolBuffers.TestProtos {
       }
       switch(method.Index) {
         case 0:
-          return self::FooResponse.DefaultInstance;
+          return global::Google.ProtocolBuffers.TestProtos.FooResponse.DefaultInstance;
         case 1:
-          return self::BarResponse.DefaultInstance;
+          return global::Google.ProtocolBuffers.TestProtos.BarResponse.DefaultInstance;
         default:
           throw new global::System.ArgumentException("Can't get here.");
       }
@@ -13127,7 +13125,7 @@ namespace Google.ProtocolBuffers.TestProtos {
       return new Stub(channel);
     }
     
-    public class Stub : self::TestService {
+    public class Stub : global::Google.ProtocolBuffers.TestProtos.TestService {
       internal Stub(pb::IRpcChannel channel) {
         this.channel = channel;
       }
@@ -13140,26 +13138,26 @@ namespace Google.ProtocolBuffers.TestProtos {
       
       public override void Foo(
           pb::IRpcController controller,
-          self::FooRequest request,
-          global::System.Action<self::FooResponse> done) {
+          global::Google.ProtocolBuffers.TestProtos.FooRequest request,
+          global::System.Action<global::Google.ProtocolBuffers.TestProtos.FooResponse> done) {
         channel.CallMethod(
           Descriptor.Methods[0],
           controller,
           request,
-          self::FooResponse.DefaultInstance,
-          pb::RpcUtil.GeneralizeCallback<self::FooResponse, self::FooResponse.Builder>(done, self::FooResponse.DefaultInstance));
+          global::Google.ProtocolBuffers.TestProtos.FooResponse.DefaultInstance,
+          pb::RpcUtil.GeneralizeCallback<global::Google.ProtocolBuffers.TestProtos.FooResponse, global::Google.ProtocolBuffers.TestProtos.FooResponse.Builder>(done, global::Google.ProtocolBuffers.TestProtos.FooResponse.DefaultInstance));
       }
       
       public override void Bar(
           pb::IRpcController controller,
-          self::BarRequest request,
-          global::System.Action<self::BarResponse> done) {
+          global::Google.ProtocolBuffers.TestProtos.BarRequest request,
+          global::System.Action<global::Google.ProtocolBuffers.TestProtos.BarResponse> done) {
         channel.CallMethod(
           Descriptor.Methods[1],
           controller,
           request,
-          self::BarResponse.DefaultInstance,
-          pb::RpcUtil.GeneralizeCallback<self::BarResponse, self::BarResponse.Builder>(done, self::BarResponse.DefaultInstance));
+          global::Google.ProtocolBuffers.TestProtos.BarResponse.DefaultInstance,
+          pb::RpcUtil.GeneralizeCallback<global::Google.ProtocolBuffers.TestProtos.BarResponse, global::Google.ProtocolBuffers.TestProtos.BarResponse.Builder>(done, global::Google.ProtocolBuffers.TestProtos.BarResponse.DefaultInstance));
       }
     }
   }
diff --git a/csharp/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs b/csharp/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
index fe8d0656..ec7bf585 100644
--- a/csharp/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
+++ b/csharp/ProtocolBuffers/DescriptorProtos/DescriptorProtoFile.cs
@@ -4,8 +4,6 @@ using pb = global::Google.ProtocolBuffers;
 using pbc = global::Google.ProtocolBuffers.Collections;
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using scg = global::System.Collections.Generic;
-using self = global::Google.ProtocolBuffers.DescriptorProtos;
-
 namespace Google.ProtocolBuffers.DescriptorProtos {
   
   public static partial class DescriptorProtoFile {
@@ -169,106 +167,106 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_FileDescriptorProto__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_FileDescriptorProto__Descriptor,
             new string[] { "Name", "Package", "Dependency", "MessageType", "EnumType", "Service", "Extension", "Options", },
-            typeof (self::FileDescriptorProto),
-            typeof (self::FileDescriptorProto.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_DescriptorProto__Descriptor 
         = Descriptor.MessageTypes[1];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_DescriptorProto__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_DescriptorProto__Descriptor,
             new string[] { "Name", "Field", "Extension", "NestedType", "EnumType", "ExtensionRange", "Options", },
-            typeof (self::DescriptorProto),
-            typeof (self::DescriptorProto.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Builder));
     internal static readonly pbd::MessageDescriptor  internal__static_google_protobuf_DescriptorProto_ExtensionRange__Descriptor 
         = internal__static_google_protobuf_DescriptorProto__Descriptor.NestedTypes[0];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_DescriptorProto_ExtensionRange__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_DescriptorProto_ExtensionRange__Descriptor,
             new string[] { "Start", "End", },
-            typeof (self::DescriptorProto.Types.ExtensionRange),
-            typeof (self::DescriptorProto.Types.ExtensionRange.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_FieldDescriptorProto__Descriptor 
         = Descriptor.MessageTypes[2];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_FieldDescriptorProto__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_FieldDescriptorProto__Descriptor,
             new string[] { "Name", "Number", "Label", "Type", "TypeName", "Extendee", "DefaultValue", "Options", },
-            typeof (self::FieldDescriptorProto),
-            typeof (self::FieldDescriptorProto.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_EnumDescriptorProto__Descriptor 
         = Descriptor.MessageTypes[3];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_EnumDescriptorProto__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_EnumDescriptorProto__Descriptor,
             new string[] { "Name", "Value", "Options", },
-            typeof (self::EnumDescriptorProto),
-            typeof (self::EnumDescriptorProto.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_EnumValueDescriptorProto__Descriptor 
         = Descriptor.MessageTypes[4];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_EnumValueDescriptorProto__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_EnumValueDescriptorProto__Descriptor,
             new string[] { "Name", "Number", "Options", },
-            typeof (self::EnumValueDescriptorProto),
-            typeof (self::EnumValueDescriptorProto.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_ServiceDescriptorProto__Descriptor 
         = Descriptor.MessageTypes[5];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_ServiceDescriptorProto__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_ServiceDescriptorProto__Descriptor,
             new string[] { "Name", "Method", "Options", },
-            typeof (self::ServiceDescriptorProto),
-            typeof (self::ServiceDescriptorProto.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_MethodDescriptorProto__Descriptor 
         = Descriptor.MessageTypes[6];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_MethodDescriptorProto__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_MethodDescriptorProto__Descriptor,
             new string[] { "Name", "InputType", "OutputType", "Options", },
-            typeof (self::MethodDescriptorProto),
-            typeof (self::MethodDescriptorProto.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_FileOptions__Descriptor 
         = Descriptor.MessageTypes[7];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_FileOptions__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_FileOptions__Descriptor,
             new string[] { "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "OptimizeFor", "CsharpNamespace", "CsharpFileClassname", "CsharpMultipleFiles", "CsharpNestClasses", "CsharpPublicClasses", },
-            typeof (self::FileOptions),
-            typeof (self::FileOptions.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.FileOptions),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_MessageOptions__Descriptor 
         = Descriptor.MessageTypes[8];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_MessageOptions__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_MessageOptions__Descriptor,
             new string[] { "MessageSetWireFormat", },
-            typeof (self::MessageOptions),
-            typeof (self::MessageOptions.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_FieldOptions__Descriptor 
         = Descriptor.MessageTypes[9];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_FieldOptions__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_FieldOptions__Descriptor,
             new string[] { "Ctype", "ExperimentalMapKey", },
-            typeof (self::FieldOptions),
-            typeof (self::FieldOptions.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_EnumOptions__Descriptor 
         = Descriptor.MessageTypes[10];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_EnumOptions__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_EnumOptions__Descriptor,
             new string[] { },
-            typeof (self::EnumOptions),
-            typeof (self::EnumOptions.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_EnumValueOptions__Descriptor 
         = Descriptor.MessageTypes[11];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_EnumValueOptions__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_EnumValueOptions__Descriptor,
             new string[] { },
-            typeof (self::EnumValueOptions),
-            typeof (self::EnumValueOptions.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_ServiceOptions__Descriptor 
         = Descriptor.MessageTypes[12];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_ServiceOptions__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_ServiceOptions__Descriptor,
             new string[] { },
-            typeof (self::ServiceOptions),
-            typeof (self::ServiceOptions.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.Builder));
     internal static readonly pbd::MessageDescriptor internal__static_google_protobuf_MethodOptions__Descriptor 
         = Descriptor.MessageTypes[13];
     internal static pb::FieldAccess.FieldAccessorTable internal__static_google_protobuf_MethodOptions__FieldAccessorTable
         = new pb::FieldAccess.FieldAccessorTable(internal__static_google_protobuf_MethodOptions__Descriptor,
             new string[] { },
-            typeof (self::MethodOptions),
-            typeof (self::MethodOptions.Builder));
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions),
+            typeof (global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.Builder));
     #endregion
     
   }
@@ -288,11 +286,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_FileDescriptorProto__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_FileDescriptorProto__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_FileDescriptorProto__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_FileDescriptorProto__FieldAccessorTable; }
     }
     
     // optional string name = 1;
@@ -328,60 +326,60 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     // repeated .google.protobuf.DescriptorProto message_type = 4;
-    private scg::IList<self::DescriptorProto> messageType_ = pbc::Lists<self::DescriptorProto>.Empty;
-    public scg::IList<self::DescriptorProto> MessageTypeList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> messageType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> MessageTypeList {
       get { return messageType_; } 
     }
     public int MessageTypeCount
       { get { return messageType_.Count; }
     }
-    public self::DescriptorProto GetMessageType(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto GetMessageType(int index) {
       return messageType_ [index];
     }
     
     // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
-    private scg::IList<self::EnumDescriptorProto> enumType_ = pbc::Lists<self::EnumDescriptorProto>.Empty;
-    public scg::IList<self::EnumDescriptorProto> EnumTypeList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> enumType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
       get { return enumType_; } 
     }
     public int EnumTypeCount
       { get { return enumType_.Count; }
     }
-    public self::EnumDescriptorProto GetEnumType(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto GetEnumType(int index) {
       return enumType_ [index];
     }
     
     // repeated .google.protobuf.ServiceDescriptorProto service = 6;
-    private scg::IList<self::ServiceDescriptorProto> service_ = pbc::Lists<self::ServiceDescriptorProto>.Empty;
-    public scg::IList<self::ServiceDescriptorProto> ServiceList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto> service_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto> ServiceList {
       get { return service_; } 
     }
     public int ServiceCount
       { get { return service_.Count; }
     }
-    public self::ServiceDescriptorProto GetService(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto GetService(int index) {
       return service_ [index];
     }
     
     // repeated .google.protobuf.FieldDescriptorProto extension = 7;
-    private scg::IList<self::FieldDescriptorProto> extension_ = pbc::Lists<self::FieldDescriptorProto>.Empty;
-    public scg::IList<self::FieldDescriptorProto> ExtensionList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> extension_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
       get { return extension_; } 
     }
     public int ExtensionCount
       { get { return extension_.Count; }
     }
-    public self::FieldDescriptorProto GetExtension(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto GetExtension(int index) {
       return extension_ [index];
     }
     
     // optional .google.protobuf.FileOptions options = 8;
     private bool hasOptions;
-    private self::FileOptions options_ = self::FileOptions.DefaultInstance;
+    private global::Google.ProtocolBuffers.DescriptorProtos.FileOptions options_ = global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.DefaultInstance;
     public bool HasOptions {
       get { return hasOptions; }
     }
-    public self::FileOptions Options {
+    public global::Google.ProtocolBuffers.DescriptorProtos.FileOptions Options {
       get { return options_; }
     }
     
@@ -401,16 +399,16 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       foreach (string element in DependencyList) {
         output.WriteString(3, element);
       }
-      foreach (self::DescriptorProto element in MessageTypeList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto element in MessageTypeList) {
         output.WriteMessage(4, element);
       }
-      foreach (self::EnumDescriptorProto element in EnumTypeList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto element in EnumTypeList) {
         output.WriteMessage(5, element);
       }
-      foreach (self::ServiceDescriptorProto element in ServiceList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto element in ServiceList) {
         output.WriteMessage(6, element);
       }
-      foreach (self::FieldDescriptorProto element in ExtensionList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto element in ExtensionList) {
         output.WriteMessage(7, element);
       }
       if (HasOptions) {
@@ -436,16 +434,16 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
           size += pb::CodedOutputStream
             .ComputeStringSize(3, element);
         }
-        foreach (self::DescriptorProto element in MessageTypeList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto element in MessageTypeList) {
           size += pb::CodedOutputStream.ComputeMessageSize(4, element);
         }
-        foreach (self::EnumDescriptorProto element in EnumTypeList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto element in EnumTypeList) {
           size += pb::CodedOutputStream.ComputeMessageSize(5, element);
         }
-        foreach (self::ServiceDescriptorProto element in ServiceList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto element in ServiceList) {
           size += pb::CodedOutputStream.ComputeMessageSize(6, element);
         }
-        foreach (self::FieldDescriptorProto element in ExtensionList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto element in ExtensionList) {
           size += pb::CodedOutputStream.ComputeMessageSize(7, element);
         }
         if (HasOptions) {
@@ -457,35 +455,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::FileDescriptorProto ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FileDescriptorProto ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FileDescriptorProto ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FileDescriptorProto ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FileDescriptorProto ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FileDescriptorProto ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FileDescriptorProto ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FileDescriptorProto ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -493,26 +491,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::FileDescriptorProto prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::FileDescriptorProto, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::FileDescriptorProto.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto.CreateBuilder()
       internal Builder() {}
       
-      self::FileDescriptorProto result = new self::FileDescriptorProto();
+      global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto result = new global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto();
       
-      protected override self::FileDescriptorProto MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::FileDescriptorProto();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto();
         return this;
       }
       
@@ -521,43 +519,43 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::FileDescriptorProto.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto.Descriptor; }
       }
       
-      public override self::FileDescriptorProto DefaultInstanceForType {
-        get { return self::FileDescriptorProto.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto.DefaultInstance; }
       }
       
-      public override self::FileDescriptorProto BuildPartial() {
+      public override global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto BuildPartial() {
         result.dependency_ = pbc::Lists<string>.AsReadOnly(result.dependency_);
-        if (result.messageType_ != pbc::Lists<self::DescriptorProto>.Empty) {
-          result.messageType_ = pbc::Lists<self::DescriptorProto>.AsReadOnly(result.messageType_);
+        if (result.messageType_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty) {
+          result.messageType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.AsReadOnly(result.messageType_);
         }
-        if (result.enumType_ != pbc::Lists<self::EnumDescriptorProto>.Empty) {
-          result.enumType_ = pbc::Lists<self::EnumDescriptorProto>.AsReadOnly(result.enumType_);
+        if (result.enumType_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty) {
+          result.enumType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.AsReadOnly(result.enumType_);
         }
-        if (result.service_ != pbc::Lists<self::ServiceDescriptorProto>.Empty) {
-          result.service_ = pbc::Lists<self::ServiceDescriptorProto>.AsReadOnly(result.service_);
+        if (result.service_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>.Empty) {
+          result.service_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>.AsReadOnly(result.service_);
         }
-        if (result.extension_ != pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.extension_ = pbc::Lists<self::FieldDescriptorProto>.AsReadOnly(result.extension_);
+        if (result.extension_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.extension_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.AsReadOnly(result.extension_);
         }
-        self::FileDescriptorProto returnMe = result;
+        global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::FileDescriptorProto) {
-          return MergeFrom((self::FileDescriptorProto) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::FileDescriptorProto other) {
-        if (other == self::FileDescriptorProto.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.FileDescriptorProto.DefaultInstance) return this;
         if (other.HasName) {
           Name = other.Name;
         }
@@ -572,25 +570,25 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         }
         if (other.messageType_.Count != 0) {
           if (result.messageType_.Count == 0) {
-            result.messageType_ = new scg::List<self::DescriptorProto>();
+            result.messageType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>();
           }
           base.AddRange(other.messageType_, result.messageType_);
         }
         if (other.enumType_.Count != 0) {
           if (result.enumType_.Count == 0) {
-            result.enumType_ = new scg::List<self::EnumDescriptorProto>();
+            result.enumType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>();
           }
           base.AddRange(other.enumType_, result.enumType_);
         }
         if (other.service_.Count != 0) {
           if (result.service_.Count == 0) {
-            result.service_ = new scg::List<self::ServiceDescriptorProto>();
+            result.service_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>();
           }
           base.AddRange(other.service_, result.service_);
         }
         if (other.extension_.Count != 0) {
           if (result.extension_.Count == 0) {
-            result.extension_ = new scg::List<self::FieldDescriptorProto>();
+            result.extension_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
           }
           base.AddRange(other.extension_, result.extension_);
         }
@@ -635,31 +633,31 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
               break;
             }
             case 34: {
-              self::DescriptorProto.Builder subBuilder = self::DescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddMessageType(subBuilder.BuildPartial());
               break;
             }
             case 42: {
-              self::EnumDescriptorProto.Builder subBuilder = self::EnumDescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddEnumType(subBuilder.BuildPartial());
               break;
             }
             case 50: {
-              self::ServiceDescriptorProto.Builder subBuilder = self::ServiceDescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddService(subBuilder.BuildPartial());
               break;
             }
             case 58: {
-              self::FieldDescriptorProto.Builder subBuilder = self::FieldDescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddExtension(subBuilder.BuildPartial());
               break;
             }
             case 66: {
-              self::FileOptions.Builder subBuilder = self::FileOptions.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.CreateBuilder();
               if (HasOptions) {
                 subBuilder.MergeFrom(Options);
               }
@@ -744,178 +742,178 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       // repeated .google.protobuf.DescriptorProto message_type = 4;
-      public scg::IList<self::DescriptorProto> MessageTypeList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> MessageTypeList {
         get { return pbc::Lists.AsReadOnly(result.messageType_); }
       }
       public int MessageTypeCount {
         get { return result.MessageTypeCount; }
       }
-      public self::DescriptorProto GetMessageType(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto GetMessageType(int index) {
         return result.GetMessageType(index);
       }
-      public Builder SetMessageType(int index, self::DescriptorProto value) {
+      public Builder SetMessageType(int index, global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto value) {
         result.messageType_[index] = value;
         return this;
       }
-      public Builder SetMessageType(int index, self::DescriptorProto.Builder builderForValue) {
+      public Builder SetMessageType(int index, global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Builder builderForValue) {
         result.messageType_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddMessageType(self::DescriptorProto value) {
-        if (result.messageType_ == pbc::Lists<self::DescriptorProto>.Empty) {
-          result.messageType_ = new scg::List<self::DescriptorProto>();
+      public Builder AddMessageType(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto value) {
+        if (result.messageType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty) {
+          result.messageType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>();
         }
         result.messageType_.Add(value);
         return this;
       }
-      public Builder AddMessageType(self::DescriptorProto.Builder builderForValue) {
-        if (result.messageType_ == pbc::Lists<self::DescriptorProto>.Empty) {
-          result.messageType_ = new scg::List<self::DescriptorProto>();
+      public Builder AddMessageType(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Builder builderForValue) {
+        if (result.messageType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty) {
+          result.messageType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>();
         }
         result.messageType_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeMessageType(scg::IEnumerable<self::DescriptorProto> values) {
-        if (result.messageType_ == pbc::Lists<self::DescriptorProto>.Empty) {
-          result.messageType_ = new scg::List<self::DescriptorProto>();
+      public Builder AddRangeMessageType(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> values) {
+        if (result.messageType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty) {
+          result.messageType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>();
         }
         base.AddRange(values, result.messageType_);
         return this;
       }
       public Builder ClearMessageType() {
-        result.messageType_ = pbc::Lists<self::DescriptorProto>.Empty;
+        result.messageType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty;
         return this;
       }
       
       // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
-      public scg::IList<self::EnumDescriptorProto> EnumTypeList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
         get { return pbc::Lists.AsReadOnly(result.enumType_); }
       }
       public int EnumTypeCount {
         get { return result.EnumTypeCount; }
       }
-      public self::EnumDescriptorProto GetEnumType(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto GetEnumType(int index) {
         return result.GetEnumType(index);
       }
-      public Builder SetEnumType(int index, self::EnumDescriptorProto value) {
+      public Builder SetEnumType(int index, global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto value) {
         result.enumType_[index] = value;
         return this;
       }
-      public Builder SetEnumType(int index, self::EnumDescriptorProto.Builder builderForValue) {
+      public Builder SetEnumType(int index, global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
         result.enumType_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddEnumType(self::EnumDescriptorProto value) {
-        if (result.enumType_ == pbc::Lists<self::EnumDescriptorProto>.Empty) {
-          result.enumType_ = new scg::List<self::EnumDescriptorProto>();
+      public Builder AddEnumType(global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto value) {
+        if (result.enumType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty) {
+          result.enumType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>();
         }
         result.enumType_.Add(value);
         return this;
       }
-      public Builder AddEnumType(self::EnumDescriptorProto.Builder builderForValue) {
-        if (result.enumType_ == pbc::Lists<self::EnumDescriptorProto>.Empty) {
-          result.enumType_ = new scg::List<self::EnumDescriptorProto>();
+      public Builder AddEnumType(global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
+        if (result.enumType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty) {
+          result.enumType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>();
         }
         result.enumType_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeEnumType(scg::IEnumerable<self::EnumDescriptorProto> values) {
-        if (result.enumType_ == pbc::Lists<self::EnumDescriptorProto>.Empty) {
-          result.enumType_ = new scg::List<self::EnumDescriptorProto>();
+      public Builder AddRangeEnumType(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> values) {
+        if (result.enumType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty) {
+          result.enumType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>();
         }
         base.AddRange(values, result.enumType_);
         return this;
       }
       public Builder ClearEnumType() {
-        result.enumType_ = pbc::Lists<self::EnumDescriptorProto>.Empty;
+        result.enumType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty;
         return this;
       }
       
       // repeated .google.protobuf.ServiceDescriptorProto service = 6;
-      public scg::IList<self::ServiceDescriptorProto> ServiceList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto> ServiceList {
         get { return pbc::Lists.AsReadOnly(result.service_); }
       }
       public int ServiceCount {
         get { return result.ServiceCount; }
       }
-      public self::ServiceDescriptorProto GetService(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto GetService(int index) {
         return result.GetService(index);
       }
-      public Builder SetService(int index, self::ServiceDescriptorProto value) {
+      public Builder SetService(int index, global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto value) {
         result.service_[index] = value;
         return this;
       }
-      public Builder SetService(int index, self::ServiceDescriptorProto.Builder builderForValue) {
+      public Builder SetService(int index, global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto.Builder builderForValue) {
         result.service_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddService(self::ServiceDescriptorProto value) {
-        if (result.service_ == pbc::Lists<self::ServiceDescriptorProto>.Empty) {
-          result.service_ = new scg::List<self::ServiceDescriptorProto>();
+      public Builder AddService(global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto value) {
+        if (result.service_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>.Empty) {
+          result.service_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>();
         }
         result.service_.Add(value);
         return this;
       }
-      public Builder AddService(self::ServiceDescriptorProto.Builder builderForValue) {
-        if (result.service_ == pbc::Lists<self::ServiceDescriptorProto>.Empty) {
-          result.service_ = new scg::List<self::ServiceDescriptorProto>();
+      public Builder AddService(global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto.Builder builderForValue) {
+        if (result.service_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>.Empty) {
+          result.service_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>();
         }
         result.service_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeService(scg::IEnumerable<self::ServiceDescriptorProto> values) {
-        if (result.service_ == pbc::Lists<self::ServiceDescriptorProto>.Empty) {
-          result.service_ = new scg::List<self::ServiceDescriptorProto>();
+      public Builder AddRangeService(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto> values) {
+        if (result.service_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>.Empty) {
+          result.service_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>();
         }
         base.AddRange(values, result.service_);
         return this;
       }
       public Builder ClearService() {
-        result.service_ = pbc::Lists<self::ServiceDescriptorProto>.Empty;
+        result.service_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto>.Empty;
         return this;
       }
       
       // repeated .google.protobuf.FieldDescriptorProto extension = 7;
-      public scg::IList<self::FieldDescriptorProto> ExtensionList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
         get { return pbc::Lists.AsReadOnly(result.extension_); }
       }
       public int ExtensionCount {
         get { return result.ExtensionCount; }
       }
-      public self::FieldDescriptorProto GetExtension(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto GetExtension(int index) {
         return result.GetExtension(index);
       }
-      public Builder SetExtension(int index, self::FieldDescriptorProto value) {
+      public Builder SetExtension(int index, global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto value) {
         result.extension_[index] = value;
         return this;
       }
-      public Builder SetExtension(int index, self::FieldDescriptorProto.Builder builderForValue) {
+      public Builder SetExtension(int index, global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         result.extension_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddExtension(self::FieldDescriptorProto value) {
-        if (result.extension_ == pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.extension_ = new scg::List<self::FieldDescriptorProto>();
+      public Builder AddExtension(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto value) {
+        if (result.extension_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.extension_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
         }
         result.extension_.Add(value);
         return this;
       }
-      public Builder AddExtension(self::FieldDescriptorProto.Builder builderForValue) {
-        if (result.extension_ == pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.extension_ = new scg::List<self::FieldDescriptorProto>();
+      public Builder AddExtension(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+        if (result.extension_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.extension_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
         }
         result.extension_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeExtension(scg::IEnumerable<self::FieldDescriptorProto> values) {
-        if (result.extension_ == pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.extension_ = new scg::List<self::FieldDescriptorProto>();
+      public Builder AddRangeExtension(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> values) {
+        if (result.extension_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.extension_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
         }
         base.AddRange(values, result.extension_);
         return this;
       }
       public Builder ClearExtension() {
-        result.extension_ = pbc::Lists<self::FieldDescriptorProto>.Empty;
+        result.extension_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty;
         return this;
       }
       
@@ -923,25 +921,25 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasOptions {
         get { return result.HasOptions; }
       }
-      public self::FileOptions Options {
+      public global::Google.ProtocolBuffers.DescriptorProtos.FileOptions Options {
         get { return result.Options; }
         set { SetOptions(value); }
       }
-      public Builder SetOptions(self::FileOptions value) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.FileOptions value) {
         result.hasOptions = true;
         result.options_ = value;
         return this;
       }
-      public Builder SetOptions(self::FileOptions.Builder builderForValue) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Builder builderForValue) {
         result.hasOptions = true;
         result.options_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptions(self::FileOptions value) {
+      public Builder MergeOptions(global::Google.ProtocolBuffers.DescriptorProtos.FileOptions value) {
         if (result.HasOptions &&
-            result.options_ != self::FileOptions.DefaultInstance) {
+            result.options_ != global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.DefaultInstance) {
           result.options_ =
-            self::FileOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
         } else {
           result.options_ = value;
         }
@@ -950,7 +948,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       public Builder ClearOptions() {
         result.hasOptions = false;
-        result.options_ = self::FileOptions.DefaultInstance;
+        result.options_ = global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.DefaultInstance;
         return this;
       }
     }
@@ -967,11 +965,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto__FieldAccessorTable; }
     }
     
     #region Nested types
@@ -987,11 +985,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         }
         
         public static pbd::MessageDescriptor Descriptor {
-          get { return self::DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto_ExtensionRange__Descriptor; }
+          get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto_ExtensionRange__Descriptor; }
         }
         
         protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-          get { return self::DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto_ExtensionRange__FieldAccessorTable; }
+          get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_DescriptorProto_ExtensionRange__FieldAccessorTable; }
         }
         
         // optional int32 start = 1;
@@ -1049,35 +1047,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
           }
         }
         
-        public static self::DescriptorProto.Types.ExtensionRange ParseFrom(pb::ByteString data) {
+        public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange ParseFrom(pb::ByteString data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::DescriptorProto.Types.ExtensionRange ParseFrom(pb::ByteString data,
+        public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange ParseFrom(pb::ByteString data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::DescriptorProto.Types.ExtensionRange ParseFrom(byte[] data) {
+        public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange ParseFrom(byte[] data) {
           return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
         }
-        public static self::DescriptorProto.Types.ExtensionRange ParseFrom(byte[] data,
+        public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange ParseFrom(byte[] data,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::DescriptorProto.Types.ExtensionRange ParseFrom(global::System.IO.Stream input) {
+        public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange ParseFrom(global::System.IO.Stream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::DescriptorProto.Types.ExtensionRange ParseFrom(
+        public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange ParseFrom(
             global::System.IO.Stream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
         }
-        public static self::DescriptorProto.Types.ExtensionRange ParseFrom(pb::CodedInputStream input) {
+        public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange ParseFrom(pb::CodedInputStream input) {
           return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
         }
-        public static self::DescriptorProto.Types.ExtensionRange ParseFrom(pb::CodedInputStream input,
+        public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange ParseFrom(pb::CodedInputStream input,
             pb::ExtensionRegistry extensionRegistry) {
           return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                    .BuildParsed();
@@ -1085,26 +1083,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         
         public static Builder CreateBuilder() { return new Builder(); }
         public override Builder CreateBuilderForType() { return new Builder(); }
-        public static Builder CreateBuilder(self::DescriptorProto.Types.ExtensionRange prototype) {
+        public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange prototype) {
           return (Builder) new Builder().MergeFrom(prototype);
         }
         
-        public sealed partial class Builder : pb::GeneratedBuilder<self::DescriptorProto.Types.ExtensionRange, Builder> {
+        public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange, Builder> {
           protected override Builder ThisBuilder {
             get { return this; }
           }
           
-          // Construct using self::DescriptorProto.Types.ExtensionRange.CreateBuilder()
+          // Construct using global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange.CreateBuilder()
           internal Builder() {}
           
-          self::DescriptorProto.Types.ExtensionRange result = new self::DescriptorProto.Types.ExtensionRange();
+          global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange result = new global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange();
           
-          protected override self::DescriptorProto.Types.ExtensionRange MessageBeingBuilt {
+          protected override global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange MessageBeingBuilt {
             get { return result; }
           }
           
           public override Builder Clear() {
-            result = new self::DescriptorProto.Types.ExtensionRange();
+            result = new global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange();
             return this;
           }
           
@@ -1113,30 +1111,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
           }
           
           public override pbd::MessageDescriptor DescriptorForType {
-            get { return self::DescriptorProto.Types.ExtensionRange.Descriptor; }
+            get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange.Descriptor; }
           }
           
-          public override self::DescriptorProto.Types.ExtensionRange DefaultInstanceForType {
-            get { return self::DescriptorProto.Types.ExtensionRange.DefaultInstance; }
+          public override global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange DefaultInstanceForType {
+            get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange.DefaultInstance; }
           }
           
-          public override self::DescriptorProto.Types.ExtensionRange BuildPartial() {
-            self::DescriptorProto.Types.ExtensionRange returnMe = result;
+          public override global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange BuildPartial() {
+            global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange returnMe = result;
             result = null;
             return returnMe;
           }
           
           public override Builder MergeFrom(pb::IMessage other) {
-            if (other is self::DescriptorProto.Types.ExtensionRange) {
-              return MergeFrom((self::DescriptorProto.Types.ExtensionRange) other);
+            if (other is global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange) {
+              return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange) other);
             } else {
               base.MergeFrom(other);
               return this;
             }
           }
           
-          public override Builder MergeFrom(self::DescriptorProto.Types.ExtensionRange other) {
-            if (other == self::DescriptorProto.Types.ExtensionRange.DefaultInstance) return this;
+          public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange other) {
+            if (other == global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange.DefaultInstance) return this;
             if (other.HasStart) {
               Start = other.Start;
             }
@@ -1235,72 +1233,72 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     // repeated .google.protobuf.FieldDescriptorProto field = 2;
-    private scg::IList<self::FieldDescriptorProto> field_ = pbc::Lists<self::FieldDescriptorProto>.Empty;
-    public scg::IList<self::FieldDescriptorProto> FieldList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> field_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> FieldList {
       get { return field_; } 
     }
     public int FieldCount
       { get { return field_.Count; }
     }
-    public self::FieldDescriptorProto GetField(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto GetField(int index) {
       return field_ [index];
     }
     
     // repeated .google.protobuf.FieldDescriptorProto extension = 6;
-    private scg::IList<self::FieldDescriptorProto> extension_ = pbc::Lists<self::FieldDescriptorProto>.Empty;
-    public scg::IList<self::FieldDescriptorProto> ExtensionList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> extension_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
       get { return extension_; } 
     }
     public int ExtensionCount
       { get { return extension_.Count; }
     }
-    public self::FieldDescriptorProto GetExtension(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto GetExtension(int index) {
       return extension_ [index];
     }
     
     // repeated .google.protobuf.DescriptorProto nested_type = 3;
-    private scg::IList<self::DescriptorProto> nestedType_ = pbc::Lists<self::DescriptorProto>.Empty;
-    public scg::IList<self::DescriptorProto> NestedTypeList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> nestedType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> NestedTypeList {
       get { return nestedType_; } 
     }
     public int NestedTypeCount
       { get { return nestedType_.Count; }
     }
-    public self::DescriptorProto GetNestedType(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto GetNestedType(int index) {
       return nestedType_ [index];
     }
     
     // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
-    private scg::IList<self::EnumDescriptorProto> enumType_ = pbc::Lists<self::EnumDescriptorProto>.Empty;
-    public scg::IList<self::EnumDescriptorProto> EnumTypeList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> enumType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
       get { return enumType_; } 
     }
     public int EnumTypeCount
       { get { return enumType_.Count; }
     }
-    public self::EnumDescriptorProto GetEnumType(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto GetEnumType(int index) {
       return enumType_ [index];
     }
     
     // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
-    private scg::IList<self::DescriptorProto.Types.ExtensionRange> extensionRange_ = pbc::Lists<self::DescriptorProto.Types.ExtensionRange>.Empty;
-    public scg::IList<self::DescriptorProto.Types.ExtensionRange> ExtensionRangeList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange> extensionRange_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange> ExtensionRangeList {
       get { return extensionRange_; } 
     }
     public int ExtensionRangeCount
       { get { return extensionRange_.Count; }
     }
-    public self::DescriptorProto.Types.ExtensionRange GetExtensionRange(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange GetExtensionRange(int index) {
       return extensionRange_ [index];
     }
     
     // optional .google.protobuf.MessageOptions options = 7;
     private bool hasOptions;
-    private self::MessageOptions options_ = self::MessageOptions.DefaultInstance;
+    private global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions options_ = global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.DefaultInstance;
     public bool HasOptions {
       get { return hasOptions; }
     }
-    public self::MessageOptions Options {
+    public global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions Options {
       get { return options_; }
     }
     
@@ -1314,19 +1312,19 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       if (HasName) {
         output.WriteString(1, Name);
       }
-      foreach (self::FieldDescriptorProto element in FieldList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto element in FieldList) {
         output.WriteMessage(2, element);
       }
-      foreach (self::DescriptorProto element in NestedTypeList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto element in NestedTypeList) {
         output.WriteMessage(3, element);
       }
-      foreach (self::EnumDescriptorProto element in EnumTypeList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto element in EnumTypeList) {
         output.WriteMessage(4, element);
       }
-      foreach (self::DescriptorProto.Types.ExtensionRange element in ExtensionRangeList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange element in ExtensionRangeList) {
         output.WriteMessage(5, element);
       }
-      foreach (self::FieldDescriptorProto element in ExtensionList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto element in ExtensionList) {
         output.WriteMessage(6, element);
       }
       if (HasOptions) {
@@ -1345,19 +1343,19 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         if (HasName) {
           size += pb::CodedOutputStream.ComputeStringSize(1, Name);
         }
-        foreach (self::FieldDescriptorProto element in FieldList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto element in FieldList) {
           size += pb::CodedOutputStream.ComputeMessageSize(2, element);
         }
-        foreach (self::DescriptorProto element in NestedTypeList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto element in NestedTypeList) {
           size += pb::CodedOutputStream.ComputeMessageSize(3, element);
         }
-        foreach (self::EnumDescriptorProto element in EnumTypeList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto element in EnumTypeList) {
           size += pb::CodedOutputStream.ComputeMessageSize(4, element);
         }
-        foreach (self::DescriptorProto.Types.ExtensionRange element in ExtensionRangeList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange element in ExtensionRangeList) {
           size += pb::CodedOutputStream.ComputeMessageSize(5, element);
         }
-        foreach (self::FieldDescriptorProto element in ExtensionList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto element in ExtensionList) {
           size += pb::CodedOutputStream.ComputeMessageSize(6, element);
         }
         if (HasOptions) {
@@ -1369,35 +1367,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::DescriptorProto ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::DescriptorProto ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::DescriptorProto ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::DescriptorProto ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::DescriptorProto ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::DescriptorProto ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::DescriptorProto ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::DescriptorProto ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -1405,26 +1403,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::DescriptorProto prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::DescriptorProto, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::DescriptorProto.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.CreateBuilder()
       internal Builder() {}
       
-      self::DescriptorProto result = new self::DescriptorProto();
+      global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto result = new global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto();
       
-      protected override self::DescriptorProto MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::DescriptorProto();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto();
         return this;
       }
       
@@ -1433,75 +1431,75 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::DescriptorProto.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Descriptor; }
       }
       
-      public override self::DescriptorProto DefaultInstanceForType {
-        get { return self::DescriptorProto.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.DefaultInstance; }
       }
       
-      public override self::DescriptorProto BuildPartial() {
-        if (result.field_ != pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.field_ = pbc::Lists<self::FieldDescriptorProto>.AsReadOnly(result.field_);
+      public override global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto BuildPartial() {
+        if (result.field_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.field_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.AsReadOnly(result.field_);
         }
-        if (result.extension_ != pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.extension_ = pbc::Lists<self::FieldDescriptorProto>.AsReadOnly(result.extension_);
+        if (result.extension_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.extension_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.AsReadOnly(result.extension_);
         }
-        if (result.nestedType_ != pbc::Lists<self::DescriptorProto>.Empty) {
-          result.nestedType_ = pbc::Lists<self::DescriptorProto>.AsReadOnly(result.nestedType_);
+        if (result.nestedType_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty) {
+          result.nestedType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.AsReadOnly(result.nestedType_);
         }
-        if (result.enumType_ != pbc::Lists<self::EnumDescriptorProto>.Empty) {
-          result.enumType_ = pbc::Lists<self::EnumDescriptorProto>.AsReadOnly(result.enumType_);
+        if (result.enumType_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty) {
+          result.enumType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.AsReadOnly(result.enumType_);
         }
-        if (result.extensionRange_ != pbc::Lists<self::DescriptorProto.Types.ExtensionRange>.Empty) {
-          result.extensionRange_ = pbc::Lists<self::DescriptorProto.Types.ExtensionRange>.AsReadOnly(result.extensionRange_);
+        if (result.extensionRange_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>.Empty) {
+          result.extensionRange_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>.AsReadOnly(result.extensionRange_);
         }
-        self::DescriptorProto returnMe = result;
+        global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::DescriptorProto) {
-          return MergeFrom((self::DescriptorProto) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::DescriptorProto other) {
-        if (other == self::DescriptorProto.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.DefaultInstance) return this;
         if (other.HasName) {
           Name = other.Name;
         }
         if (other.field_.Count != 0) {
           if (result.field_.Count == 0) {
-            result.field_ = new scg::List<self::FieldDescriptorProto>();
+            result.field_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
           }
           base.AddRange(other.field_, result.field_);
         }
         if (other.extension_.Count != 0) {
           if (result.extension_.Count == 0) {
-            result.extension_ = new scg::List<self::FieldDescriptorProto>();
+            result.extension_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
           }
           base.AddRange(other.extension_, result.extension_);
         }
         if (other.nestedType_.Count != 0) {
           if (result.nestedType_.Count == 0) {
-            result.nestedType_ = new scg::List<self::DescriptorProto>();
+            result.nestedType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>();
           }
           base.AddRange(other.nestedType_, result.nestedType_);
         }
         if (other.enumType_.Count != 0) {
           if (result.enumType_.Count == 0) {
-            result.enumType_ = new scg::List<self::EnumDescriptorProto>();
+            result.enumType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>();
           }
           base.AddRange(other.enumType_, result.enumType_);
         }
         if (other.extensionRange_.Count != 0) {
           if (result.extensionRange_.Count == 0) {
-            result.extensionRange_ = new scg::List<self::DescriptorProto.Types.ExtensionRange>();
+            result.extensionRange_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>();
           }
           base.AddRange(other.extensionRange_, result.extensionRange_);
         }
@@ -1538,37 +1536,37 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
               break;
             }
             case 18: {
-              self::FieldDescriptorProto.Builder subBuilder = self::FieldDescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddField(subBuilder.BuildPartial());
               break;
             }
             case 26: {
-              self::DescriptorProto.Builder subBuilder = self::DescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddNestedType(subBuilder.BuildPartial());
               break;
             }
             case 34: {
-              self::EnumDescriptorProto.Builder subBuilder = self::EnumDescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddEnumType(subBuilder.BuildPartial());
               break;
             }
             case 42: {
-              self::DescriptorProto.Types.ExtensionRange.Builder subBuilder = self::DescriptorProto.Types.ExtensionRange.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddExtensionRange(subBuilder.BuildPartial());
               break;
             }
             case 50: {
-              self::FieldDescriptorProto.Builder subBuilder = self::FieldDescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddExtension(subBuilder.BuildPartial());
               break;
             }
             case 58: {
-              self::MessageOptions.Builder subBuilder = self::MessageOptions.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.CreateBuilder();
               if (HasOptions) {
                 subBuilder.MergeFrom(Options);
               }
@@ -1601,222 +1599,222 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       // repeated .google.protobuf.FieldDescriptorProto field = 2;
-      public scg::IList<self::FieldDescriptorProto> FieldList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> FieldList {
         get { return pbc::Lists.AsReadOnly(result.field_); }
       }
       public int FieldCount {
         get { return result.FieldCount; }
       }
-      public self::FieldDescriptorProto GetField(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto GetField(int index) {
         return result.GetField(index);
       }
-      public Builder SetField(int index, self::FieldDescriptorProto value) {
+      public Builder SetField(int index, global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto value) {
         result.field_[index] = value;
         return this;
       }
-      public Builder SetField(int index, self::FieldDescriptorProto.Builder builderForValue) {
+      public Builder SetField(int index, global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         result.field_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddField(self::FieldDescriptorProto value) {
-        if (result.field_ == pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.field_ = new scg::List<self::FieldDescriptorProto>();
+      public Builder AddField(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto value) {
+        if (result.field_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.field_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
         }
         result.field_.Add(value);
         return this;
       }
-      public Builder AddField(self::FieldDescriptorProto.Builder builderForValue) {
-        if (result.field_ == pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.field_ = new scg::List<self::FieldDescriptorProto>();
+      public Builder AddField(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+        if (result.field_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.field_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
         }
         result.field_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeField(scg::IEnumerable<self::FieldDescriptorProto> values) {
-        if (result.field_ == pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.field_ = new scg::List<self::FieldDescriptorProto>();
+      public Builder AddRangeField(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> values) {
+        if (result.field_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.field_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
         }
         base.AddRange(values, result.field_);
         return this;
       }
       public Builder ClearField() {
-        result.field_ = pbc::Lists<self::FieldDescriptorProto>.Empty;
+        result.field_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty;
         return this;
       }
       
       // repeated .google.protobuf.FieldDescriptorProto extension = 6;
-      public scg::IList<self::FieldDescriptorProto> ExtensionList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> ExtensionList {
         get { return pbc::Lists.AsReadOnly(result.extension_); }
       }
       public int ExtensionCount {
         get { return result.ExtensionCount; }
       }
-      public self::FieldDescriptorProto GetExtension(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto GetExtension(int index) {
         return result.GetExtension(index);
       }
-      public Builder SetExtension(int index, self::FieldDescriptorProto value) {
+      public Builder SetExtension(int index, global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto value) {
         result.extension_[index] = value;
         return this;
       }
-      public Builder SetExtension(int index, self::FieldDescriptorProto.Builder builderForValue) {
+      public Builder SetExtension(int index, global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
         result.extension_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddExtension(self::FieldDescriptorProto value) {
-        if (result.extension_ == pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.extension_ = new scg::List<self::FieldDescriptorProto>();
+      public Builder AddExtension(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto value) {
+        if (result.extension_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.extension_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
         }
         result.extension_.Add(value);
         return this;
       }
-      public Builder AddExtension(self::FieldDescriptorProto.Builder builderForValue) {
-        if (result.extension_ == pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.extension_ = new scg::List<self::FieldDescriptorProto>();
+      public Builder AddExtension(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Builder builderForValue) {
+        if (result.extension_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.extension_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
         }
         result.extension_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeExtension(scg::IEnumerable<self::FieldDescriptorProto> values) {
-        if (result.extension_ == pbc::Lists<self::FieldDescriptorProto>.Empty) {
-          result.extension_ = new scg::List<self::FieldDescriptorProto>();
+      public Builder AddRangeExtension(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto> values) {
+        if (result.extension_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty) {
+          result.extension_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>();
         }
         base.AddRange(values, result.extension_);
         return this;
       }
       public Builder ClearExtension() {
-        result.extension_ = pbc::Lists<self::FieldDescriptorProto>.Empty;
+        result.extension_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto>.Empty;
         return this;
       }
       
       // repeated .google.protobuf.DescriptorProto nested_type = 3;
-      public scg::IList<self::DescriptorProto> NestedTypeList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> NestedTypeList {
         get { return pbc::Lists.AsReadOnly(result.nestedType_); }
       }
       public int NestedTypeCount {
         get { return result.NestedTypeCount; }
       }
-      public self::DescriptorProto GetNestedType(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto GetNestedType(int index) {
         return result.GetNestedType(index);
       }
-      public Builder SetNestedType(int index, self::DescriptorProto value) {
+      public Builder SetNestedType(int index, global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto value) {
         result.nestedType_[index] = value;
         return this;
       }
-      public Builder SetNestedType(int index, self::DescriptorProto.Builder builderForValue) {
+      public Builder SetNestedType(int index, global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Builder builderForValue) {
         result.nestedType_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddNestedType(self::DescriptorProto value) {
-        if (result.nestedType_ == pbc::Lists<self::DescriptorProto>.Empty) {
-          result.nestedType_ = new scg::List<self::DescriptorProto>();
+      public Builder AddNestedType(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto value) {
+        if (result.nestedType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty) {
+          result.nestedType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>();
         }
         result.nestedType_.Add(value);
         return this;
       }
-      public Builder AddNestedType(self::DescriptorProto.Builder builderForValue) {
-        if (result.nestedType_ == pbc::Lists<self::DescriptorProto>.Empty) {
-          result.nestedType_ = new scg::List<self::DescriptorProto>();
+      public Builder AddNestedType(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Builder builderForValue) {
+        if (result.nestedType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty) {
+          result.nestedType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>();
         }
         result.nestedType_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeNestedType(scg::IEnumerable<self::DescriptorProto> values) {
-        if (result.nestedType_ == pbc::Lists<self::DescriptorProto>.Empty) {
-          result.nestedType_ = new scg::List<self::DescriptorProto>();
+      public Builder AddRangeNestedType(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto> values) {
+        if (result.nestedType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty) {
+          result.nestedType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>();
         }
         base.AddRange(values, result.nestedType_);
         return this;
       }
       public Builder ClearNestedType() {
-        result.nestedType_ = pbc::Lists<self::DescriptorProto>.Empty;
+        result.nestedType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto>.Empty;
         return this;
       }
       
       // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
-      public scg::IList<self::EnumDescriptorProto> EnumTypeList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> EnumTypeList {
         get { return pbc::Lists.AsReadOnly(result.enumType_); }
       }
       public int EnumTypeCount {
         get { return result.EnumTypeCount; }
       }
-      public self::EnumDescriptorProto GetEnumType(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto GetEnumType(int index) {
         return result.GetEnumType(index);
       }
-      public Builder SetEnumType(int index, self::EnumDescriptorProto value) {
+      public Builder SetEnumType(int index, global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto value) {
         result.enumType_[index] = value;
         return this;
       }
-      public Builder SetEnumType(int index, self::EnumDescriptorProto.Builder builderForValue) {
+      public Builder SetEnumType(int index, global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
         result.enumType_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddEnumType(self::EnumDescriptorProto value) {
-        if (result.enumType_ == pbc::Lists<self::EnumDescriptorProto>.Empty) {
-          result.enumType_ = new scg::List<self::EnumDescriptorProto>();
+      public Builder AddEnumType(global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto value) {
+        if (result.enumType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty) {
+          result.enumType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>();
         }
         result.enumType_.Add(value);
         return this;
       }
-      public Builder AddEnumType(self::EnumDescriptorProto.Builder builderForValue) {
-        if (result.enumType_ == pbc::Lists<self::EnumDescriptorProto>.Empty) {
-          result.enumType_ = new scg::List<self::EnumDescriptorProto>();
+      public Builder AddEnumType(global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.Builder builderForValue) {
+        if (result.enumType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty) {
+          result.enumType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>();
         }
         result.enumType_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeEnumType(scg::IEnumerable<self::EnumDescriptorProto> values) {
-        if (result.enumType_ == pbc::Lists<self::EnumDescriptorProto>.Empty) {
-          result.enumType_ = new scg::List<self::EnumDescriptorProto>();
+      public Builder AddRangeEnumType(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto> values) {
+        if (result.enumType_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty) {
+          result.enumType_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>();
         }
         base.AddRange(values, result.enumType_);
         return this;
       }
       public Builder ClearEnumType() {
-        result.enumType_ = pbc::Lists<self::EnumDescriptorProto>.Empty;
+        result.enumType_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto>.Empty;
         return this;
       }
       
       // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
-      public scg::IList<self::DescriptorProto.Types.ExtensionRange> ExtensionRangeList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange> ExtensionRangeList {
         get { return pbc::Lists.AsReadOnly(result.extensionRange_); }
       }
       public int ExtensionRangeCount {
         get { return result.ExtensionRangeCount; }
       }
-      public self::DescriptorProto.Types.ExtensionRange GetExtensionRange(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange GetExtensionRange(int index) {
         return result.GetExtensionRange(index);
       }
-      public Builder SetExtensionRange(int index, self::DescriptorProto.Types.ExtensionRange value) {
+      public Builder SetExtensionRange(int index, global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange value) {
         result.extensionRange_[index] = value;
         return this;
       }
-      public Builder SetExtensionRange(int index, self::DescriptorProto.Types.ExtensionRange.Builder builderForValue) {
+      public Builder SetExtensionRange(int index, global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange.Builder builderForValue) {
         result.extensionRange_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddExtensionRange(self::DescriptorProto.Types.ExtensionRange value) {
-        if (result.extensionRange_ == pbc::Lists<self::DescriptorProto.Types.ExtensionRange>.Empty) {
-          result.extensionRange_ = new scg::List<self::DescriptorProto.Types.ExtensionRange>();
+      public Builder AddExtensionRange(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange value) {
+        if (result.extensionRange_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>.Empty) {
+          result.extensionRange_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>();
         }
         result.extensionRange_.Add(value);
         return this;
       }
-      public Builder AddExtensionRange(self::DescriptorProto.Types.ExtensionRange.Builder builderForValue) {
-        if (result.extensionRange_ == pbc::Lists<self::DescriptorProto.Types.ExtensionRange>.Empty) {
-          result.extensionRange_ = new scg::List<self::DescriptorProto.Types.ExtensionRange>();
+      public Builder AddExtensionRange(global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange.Builder builderForValue) {
+        if (result.extensionRange_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>.Empty) {
+          result.extensionRange_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>();
         }
         result.extensionRange_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeExtensionRange(scg::IEnumerable<self::DescriptorProto.Types.ExtensionRange> values) {
-        if (result.extensionRange_ == pbc::Lists<self::DescriptorProto.Types.ExtensionRange>.Empty) {
-          result.extensionRange_ = new scg::List<self::DescriptorProto.Types.ExtensionRange>();
+      public Builder AddRangeExtensionRange(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange> values) {
+        if (result.extensionRange_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>.Empty) {
+          result.extensionRange_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>();
         }
         base.AddRange(values, result.extensionRange_);
         return this;
       }
       public Builder ClearExtensionRange() {
-        result.extensionRange_ = pbc::Lists<self::DescriptorProto.Types.ExtensionRange>.Empty;
+        result.extensionRange_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProto.Types.ExtensionRange>.Empty;
         return this;
       }
       
@@ -1824,25 +1822,25 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasOptions {
         get { return result.HasOptions; }
       }
-      public self::MessageOptions Options {
+      public global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions Options {
         get { return result.Options; }
         set { SetOptions(value); }
       }
-      public Builder SetOptions(self::MessageOptions value) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions value) {
         result.hasOptions = true;
         result.options_ = value;
         return this;
       }
-      public Builder SetOptions(self::MessageOptions.Builder builderForValue) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.Builder builderForValue) {
         result.hasOptions = true;
         result.options_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptions(self::MessageOptions value) {
+      public Builder MergeOptions(global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions value) {
         if (result.HasOptions &&
-            result.options_ != self::MessageOptions.DefaultInstance) {
+            result.options_ != global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.DefaultInstance) {
           result.options_ =
-            self::MessageOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
         } else {
           result.options_ = value;
         }
@@ -1851,7 +1849,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       public Builder ClearOptions() {
         result.hasOptions = false;
-        result.options_ = self::MessageOptions.DefaultInstance;
+        result.options_ = global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.DefaultInstance;
         return this;
       }
     }
@@ -1868,11 +1866,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_FieldDescriptorProto__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_FieldDescriptorProto__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_FieldDescriptorProto__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_FieldDescriptorProto__FieldAccessorTable; }
     }
     
     #region Nested types
@@ -1929,19 +1927,19 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
     private bool hasLabel;
-    private self::FieldDescriptorProto.Types.Label label_ = self::FieldDescriptorProto.Types.Label.LABEL_OPTIONAL;
+    private global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Label label_ = global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL;
     public bool HasLabel {
       get { return hasLabel; }
     }
-    public self::FieldDescriptorProto.Types.Label Label {  get { return label_; }}
+    public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Label Label {  get { return label_; }}
     
     // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
     private bool hasType;
-    private self::FieldDescriptorProto.Types.Type type_ = self::FieldDescriptorProto.Types.Type.TYPE_DOUBLE;
+    private global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Type type_ = global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Type.TYPE_DOUBLE;
     public bool HasType {
       get { return hasType; }
     }
-    public self::FieldDescriptorProto.Types.Type Type {  get { return type_; }}
+    public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Type Type {  get { return type_; }}
     
     // optional string type_name = 6;
     private bool hasTypeName;
@@ -1975,11 +1973,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     // optional .google.protobuf.FieldOptions options = 8;
     private bool hasOptions;
-    private self::FieldOptions options_ = self::FieldOptions.DefaultInstance;
+    private global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions options_ = global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.DefaultInstance;
     public bool HasOptions {
       get { return hasOptions; }
     }
-    public self::FieldOptions Options {
+    public global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions Options {
       get { return options_; }
     }
     
@@ -2056,35 +2054,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::FieldDescriptorProto ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FieldDescriptorProto ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FieldDescriptorProto ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FieldDescriptorProto ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FieldDescriptorProto ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FieldDescriptorProto ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FieldDescriptorProto ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FieldDescriptorProto ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -2092,26 +2090,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::FieldDescriptorProto prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::FieldDescriptorProto, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::FieldDescriptorProto.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.CreateBuilder()
       internal Builder() {}
       
-      self::FieldDescriptorProto result = new self::FieldDescriptorProto();
+      global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto result = new global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto();
       
-      protected override self::FieldDescriptorProto MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::FieldDescriptorProto();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto();
         return this;
       }
       
@@ -2120,30 +2118,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::FieldDescriptorProto.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Descriptor; }
       }
       
-      public override self::FieldDescriptorProto DefaultInstanceForType {
-        get { return self::FieldDescriptorProto.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.DefaultInstance; }
       }
       
-      public override self::FieldDescriptorProto BuildPartial() {
-        self::FieldDescriptorProto returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::FieldDescriptorProto) {
-          return MergeFrom((self::FieldDescriptorProto) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::FieldDescriptorProto other) {
-        if (other == self::FieldDescriptorProto.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.DefaultInstance) return this;
         if (other.HasName) {
           Name = other.Name;
         }
@@ -2207,19 +2205,19 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
             }
             case 32: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::FieldDescriptorProto.Types.Label), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Label), rawValue)) {
                 unknownFields.MergeVarintField(4, (ulong) rawValue);
               } else {
-                Label = (self::FieldDescriptorProto.Types.Label) rawValue;
+                Label = (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Label) rawValue;
               }
               break;
             }
             case 40: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::FieldDescriptorProto.Types.Type), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Type), rawValue)) {
                 unknownFields.MergeVarintField(5, (ulong) rawValue);
               } else {
-                Type = (self::FieldDescriptorProto.Types.Type) rawValue;
+                Type = (global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Type) rawValue;
               }
               break;
             }
@@ -2232,7 +2230,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
               break;
             }
             case 66: {
-              self::FieldOptions.Builder subBuilder = self::FieldOptions.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.CreateBuilder();
               if (HasOptions) {
                 subBuilder.MergeFrom(Options);
               }
@@ -2287,18 +2285,18 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasLabel {
         get { return result.HasLabel; }
       }
-      public self::FieldDescriptorProto.Types.Label Label {
+      public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Label Label {
         get { return result.Label; }
         set { SetLabel(value); }
       }
-      public Builder SetLabel(self::FieldDescriptorProto.Types.Label value) {
+      public Builder SetLabel(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Label value) {
         result.hasLabel = true;
         result.label_ = value;
         return this;
       }
       public Builder ClearLabel() {
         result.hasLabel = false;
-        result.label_ = self::FieldDescriptorProto.Types.Label.LABEL_OPTIONAL;
+        result.label_ = global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL;
         return this;
       }
       
@@ -2306,18 +2304,18 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasType {
         get { return result.HasType; }
       }
-      public self::FieldDescriptorProto.Types.Type Type {
+      public global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Type Type {
         get { return result.Type; }
         set { SetType(value); }
       }
-      public Builder SetType(self::FieldDescriptorProto.Types.Type value) {
+      public Builder SetType(global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Type value) {
         result.hasType = true;
         result.type_ = value;
         return this;
       }
       public Builder ClearType() {
         result.hasType = false;
-        result.type_ = self::FieldDescriptorProto.Types.Type.TYPE_DOUBLE;
+        result.type_ = global::Google.ProtocolBuffers.DescriptorProtos.FieldDescriptorProto.Types.Type.TYPE_DOUBLE;
         return this;
       }
       
@@ -2382,25 +2380,25 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasOptions {
         get { return result.HasOptions; }
       }
-      public self::FieldOptions Options {
+      public global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions Options {
         get { return result.Options; }
         set { SetOptions(value); }
       }
-      public Builder SetOptions(self::FieldOptions value) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions value) {
         result.hasOptions = true;
         result.options_ = value;
         return this;
       }
-      public Builder SetOptions(self::FieldOptions.Builder builderForValue) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Builder builderForValue) {
         result.hasOptions = true;
         result.options_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptions(self::FieldOptions value) {
+      public Builder MergeOptions(global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions value) {
         if (result.HasOptions &&
-            result.options_ != self::FieldOptions.DefaultInstance) {
+            result.options_ != global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.DefaultInstance) {
           result.options_ =
-            self::FieldOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
         } else {
           result.options_ = value;
         }
@@ -2409,7 +2407,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       public Builder ClearOptions() {
         result.hasOptions = false;
-        result.options_ = self::FieldOptions.DefaultInstance;
+        result.options_ = global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.DefaultInstance;
         return this;
       }
     }
@@ -2426,11 +2424,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_EnumDescriptorProto__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_EnumDescriptorProto__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_EnumDescriptorProto__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_EnumDescriptorProto__FieldAccessorTable; }
     }
     
     // optional string name = 1;
@@ -2444,24 +2442,24 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
-    private scg::IList<self::EnumValueDescriptorProto> value_ = pbc::Lists<self::EnumValueDescriptorProto>.Empty;
-    public scg::IList<self::EnumValueDescriptorProto> ValueList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto> value_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto> ValueList {
       get { return value_; } 
     }
     public int ValueCount
       { get { return value_.Count; }
     }
-    public self::EnumValueDescriptorProto GetValue(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto GetValue(int index) {
       return value_ [index];
     }
     
     // optional .google.protobuf.EnumOptions options = 3;
     private bool hasOptions;
-    private self::EnumOptions options_ = self::EnumOptions.DefaultInstance;
+    private global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions options_ = global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.DefaultInstance;
     public bool HasOptions {
       get { return hasOptions; }
     }
-    public self::EnumOptions Options {
+    public global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions Options {
       get { return options_; }
     }
     
@@ -2475,7 +2473,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       if (HasName) {
         output.WriteString(1, Name);
       }
-      foreach (self::EnumValueDescriptorProto element in ValueList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto element in ValueList) {
         output.WriteMessage(2, element);
       }
       if (HasOptions) {
@@ -2494,7 +2492,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         if (HasName) {
           size += pb::CodedOutputStream.ComputeStringSize(1, Name);
         }
-        foreach (self::EnumValueDescriptorProto element in ValueList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto element in ValueList) {
           size += pb::CodedOutputStream.ComputeMessageSize(2, element);
         }
         if (HasOptions) {
@@ -2506,35 +2504,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::EnumDescriptorProto ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::EnumDescriptorProto ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumDescriptorProto ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::EnumDescriptorProto ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumDescriptorProto ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::EnumDescriptorProto ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumDescriptorProto ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::EnumDescriptorProto ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -2542,26 +2540,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::EnumDescriptorProto prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::EnumDescriptorProto, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::EnumDescriptorProto.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.CreateBuilder()
       internal Builder() {}
       
-      self::EnumDescriptorProto result = new self::EnumDescriptorProto();
+      global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto result = new global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto();
       
-      protected override self::EnumDescriptorProto MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::EnumDescriptorProto();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto();
         return this;
       }
       
@@ -2570,39 +2568,39 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::EnumDescriptorProto.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.Descriptor; }
       }
       
-      public override self::EnumDescriptorProto DefaultInstanceForType {
-        get { return self::EnumDescriptorProto.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.DefaultInstance; }
       }
       
-      public override self::EnumDescriptorProto BuildPartial() {
-        if (result.value_ != pbc::Lists<self::EnumValueDescriptorProto>.Empty) {
-          result.value_ = pbc::Lists<self::EnumValueDescriptorProto>.AsReadOnly(result.value_);
+      public override global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto BuildPartial() {
+        if (result.value_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>.Empty) {
+          result.value_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>.AsReadOnly(result.value_);
         }
-        self::EnumDescriptorProto returnMe = result;
+        global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::EnumDescriptorProto) {
-          return MergeFrom((self::EnumDescriptorProto) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::EnumDescriptorProto other) {
-        if (other == self::EnumDescriptorProto.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.EnumDescriptorProto.DefaultInstance) return this;
         if (other.HasName) {
           Name = other.Name;
         }
         if (other.value_.Count != 0) {
           if (result.value_.Count == 0) {
-            result.value_ = new scg::List<self::EnumValueDescriptorProto>();
+            result.value_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>();
           }
           base.AddRange(other.value_, result.value_);
         }
@@ -2639,13 +2637,13 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
               break;
             }
             case 18: {
-              self::EnumValueDescriptorProto.Builder subBuilder = self::EnumValueDescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddValue(subBuilder.BuildPartial());
               break;
             }
             case 26: {
-              self::EnumOptions.Builder subBuilder = self::EnumOptions.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.CreateBuilder();
               if (HasOptions) {
                 subBuilder.MergeFrom(Options);
               }
@@ -2678,46 +2676,46 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
-      public scg::IList<self::EnumValueDescriptorProto> ValueList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto> ValueList {
         get { return pbc::Lists.AsReadOnly(result.value_); }
       }
       public int ValueCount {
         get { return result.ValueCount; }
       }
-      public self::EnumValueDescriptorProto GetValue(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto GetValue(int index) {
         return result.GetValue(index);
       }
-      public Builder SetValue(int index, self::EnumValueDescriptorProto value) {
+      public Builder SetValue(int index, global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto value) {
         result.value_[index] = value;
         return this;
       }
-      public Builder SetValue(int index, self::EnumValueDescriptorProto.Builder builderForValue) {
+      public Builder SetValue(int index, global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto.Builder builderForValue) {
         result.value_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddValue(self::EnumValueDescriptorProto value) {
-        if (result.value_ == pbc::Lists<self::EnumValueDescriptorProto>.Empty) {
-          result.value_ = new scg::List<self::EnumValueDescriptorProto>();
+      public Builder AddValue(global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto value) {
+        if (result.value_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>.Empty) {
+          result.value_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>();
         }
         result.value_.Add(value);
         return this;
       }
-      public Builder AddValue(self::EnumValueDescriptorProto.Builder builderForValue) {
-        if (result.value_ == pbc::Lists<self::EnumValueDescriptorProto>.Empty) {
-          result.value_ = new scg::List<self::EnumValueDescriptorProto>();
+      public Builder AddValue(global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto.Builder builderForValue) {
+        if (result.value_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>.Empty) {
+          result.value_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>();
         }
         result.value_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeValue(scg::IEnumerable<self::EnumValueDescriptorProto> values) {
-        if (result.value_ == pbc::Lists<self::EnumValueDescriptorProto>.Empty) {
-          result.value_ = new scg::List<self::EnumValueDescriptorProto>();
+      public Builder AddRangeValue(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto> values) {
+        if (result.value_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>.Empty) {
+          result.value_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>();
         }
         base.AddRange(values, result.value_);
         return this;
       }
       public Builder ClearValue() {
-        result.value_ = pbc::Lists<self::EnumValueDescriptorProto>.Empty;
+        result.value_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto>.Empty;
         return this;
       }
       
@@ -2725,25 +2723,25 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasOptions {
         get { return result.HasOptions; }
       }
-      public self::EnumOptions Options {
+      public global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions Options {
         get { return result.Options; }
         set { SetOptions(value); }
       }
-      public Builder SetOptions(self::EnumOptions value) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions value) {
         result.hasOptions = true;
         result.options_ = value;
         return this;
       }
-      public Builder SetOptions(self::EnumOptions.Builder builderForValue) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.Builder builderForValue) {
         result.hasOptions = true;
         result.options_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptions(self::EnumOptions value) {
+      public Builder MergeOptions(global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions value) {
         if (result.HasOptions &&
-            result.options_ != self::EnumOptions.DefaultInstance) {
+            result.options_ != global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.DefaultInstance) {
           result.options_ =
-            self::EnumOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
         } else {
           result.options_ = value;
         }
@@ -2752,7 +2750,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       public Builder ClearOptions() {
         result.hasOptions = false;
-        result.options_ = self::EnumOptions.DefaultInstance;
+        result.options_ = global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.DefaultInstance;
         return this;
       }
     }
@@ -2769,11 +2767,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_EnumValueDescriptorProto__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_EnumValueDescriptorProto__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_EnumValueDescriptorProto__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_EnumValueDescriptorProto__FieldAccessorTable; }
     }
     
     // optional string name = 1;
@@ -2798,11 +2796,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     // optional .google.protobuf.EnumValueOptions options = 3;
     private bool hasOptions;
-    private self::EnumValueOptions options_ = self::EnumValueOptions.DefaultInstance;
+    private global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions options_ = global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.DefaultInstance;
     public bool HasOptions {
       get { return hasOptions; }
     }
-    public self::EnumValueOptions Options {
+    public global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions Options {
       get { return options_; }
     }
     
@@ -2847,35 +2845,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::EnumValueDescriptorProto ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::EnumValueDescriptorProto ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumValueDescriptorProto ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::EnumValueDescriptorProto ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumValueDescriptorProto ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::EnumValueDescriptorProto ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumValueDescriptorProto ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::EnumValueDescriptorProto ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -2883,26 +2881,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::EnumValueDescriptorProto prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::EnumValueDescriptorProto, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::EnumValueDescriptorProto.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto.CreateBuilder()
       internal Builder() {}
       
-      self::EnumValueDescriptorProto result = new self::EnumValueDescriptorProto();
+      global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto result = new global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto();
       
-      protected override self::EnumValueDescriptorProto MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::EnumValueDescriptorProto();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto();
         return this;
       }
       
@@ -2911,30 +2909,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::EnumValueDescriptorProto.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto.Descriptor; }
       }
       
-      public override self::EnumValueDescriptorProto DefaultInstanceForType {
-        get { return self::EnumValueDescriptorProto.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto.DefaultInstance; }
       }
       
-      public override self::EnumValueDescriptorProto BuildPartial() {
-        self::EnumValueDescriptorProto returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::EnumValueDescriptorProto) {
-          return MergeFrom((self::EnumValueDescriptorProto) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::EnumValueDescriptorProto other) {
-        if (other == self::EnumValueDescriptorProto.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.EnumValueDescriptorProto.DefaultInstance) return this;
         if (other.HasName) {
           Name = other.Name;
         }
@@ -2978,7 +2976,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
               break;
             }
             case 26: {
-              self::EnumValueOptions.Builder subBuilder = self::EnumValueOptions.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.CreateBuilder();
               if (HasOptions) {
                 subBuilder.MergeFrom(Options);
               }
@@ -3033,25 +3031,25 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasOptions {
         get { return result.HasOptions; }
       }
-      public self::EnumValueOptions Options {
+      public global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions Options {
         get { return result.Options; }
         set { SetOptions(value); }
       }
-      public Builder SetOptions(self::EnumValueOptions value) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions value) {
         result.hasOptions = true;
         result.options_ = value;
         return this;
       }
-      public Builder SetOptions(self::EnumValueOptions.Builder builderForValue) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.Builder builderForValue) {
         result.hasOptions = true;
         result.options_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptions(self::EnumValueOptions value) {
+      public Builder MergeOptions(global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions value) {
         if (result.HasOptions &&
-            result.options_ != self::EnumValueOptions.DefaultInstance) {
+            result.options_ != global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.DefaultInstance) {
           result.options_ =
-            self::EnumValueOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
         } else {
           result.options_ = value;
         }
@@ -3060,7 +3058,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       public Builder ClearOptions() {
         result.hasOptions = false;
-        result.options_ = self::EnumValueOptions.DefaultInstance;
+        result.options_ = global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.DefaultInstance;
         return this;
       }
     }
@@ -3077,11 +3075,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_ServiceDescriptorProto__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_ServiceDescriptorProto__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_ServiceDescriptorProto__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_ServiceDescriptorProto__FieldAccessorTable; }
     }
     
     // optional string name = 1;
@@ -3095,24 +3093,24 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     // repeated .google.protobuf.MethodDescriptorProto method = 2;
-    private scg::IList<self::MethodDescriptorProto> method_ = pbc::Lists<self::MethodDescriptorProto>.Empty;
-    public scg::IList<self::MethodDescriptorProto> MethodList {
+    private scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto> method_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>.Empty;
+    public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto> MethodList {
       get { return method_; } 
     }
     public int MethodCount
       { get { return method_.Count; }
     }
-    public self::MethodDescriptorProto GetMethod(int index) {
+    public global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto GetMethod(int index) {
       return method_ [index];
     }
     
     // optional .google.protobuf.ServiceOptions options = 3;
     private bool hasOptions;
-    private self::ServiceOptions options_ = self::ServiceOptions.DefaultInstance;
+    private global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions options_ = global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.DefaultInstance;
     public bool HasOptions {
       get { return hasOptions; }
     }
-    public self::ServiceOptions Options {
+    public global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions Options {
       get { return options_; }
     }
     
@@ -3126,7 +3124,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       if (HasName) {
         output.WriteString(1, Name);
       }
-      foreach (self::MethodDescriptorProto element in MethodList) {
+      foreach (global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto element in MethodList) {
         output.WriteMessage(2, element);
       }
       if (HasOptions) {
@@ -3145,7 +3143,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
         if (HasName) {
           size += pb::CodedOutputStream.ComputeStringSize(1, Name);
         }
-        foreach (self::MethodDescriptorProto element in MethodList) {
+        foreach (global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto element in MethodList) {
           size += pb::CodedOutputStream.ComputeMessageSize(2, element);
         }
         if (HasOptions) {
@@ -3157,35 +3155,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::ServiceDescriptorProto ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::ServiceDescriptorProto ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ServiceDescriptorProto ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::ServiceDescriptorProto ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ServiceDescriptorProto ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::ServiceDescriptorProto ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ServiceDescriptorProto ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::ServiceDescriptorProto ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -3193,26 +3191,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::ServiceDescriptorProto prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::ServiceDescriptorProto, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::ServiceDescriptorProto.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto.CreateBuilder()
       internal Builder() {}
       
-      self::ServiceDescriptorProto result = new self::ServiceDescriptorProto();
+      global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto result = new global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto();
       
-      protected override self::ServiceDescriptorProto MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::ServiceDescriptorProto();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto();
         return this;
       }
       
@@ -3221,39 +3219,39 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::ServiceDescriptorProto.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto.Descriptor; }
       }
       
-      public override self::ServiceDescriptorProto DefaultInstanceForType {
-        get { return self::ServiceDescriptorProto.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto.DefaultInstance; }
       }
       
-      public override self::ServiceDescriptorProto BuildPartial() {
-        if (result.method_ != pbc::Lists<self::MethodDescriptorProto>.Empty) {
-          result.method_ = pbc::Lists<self::MethodDescriptorProto>.AsReadOnly(result.method_);
+      public override global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto BuildPartial() {
+        if (result.method_ != pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>.Empty) {
+          result.method_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>.AsReadOnly(result.method_);
         }
-        self::ServiceDescriptorProto returnMe = result;
+        global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::ServiceDescriptorProto) {
-          return MergeFrom((self::ServiceDescriptorProto) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::ServiceDescriptorProto other) {
-        if (other == self::ServiceDescriptorProto.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.ServiceDescriptorProto.DefaultInstance) return this;
         if (other.HasName) {
           Name = other.Name;
         }
         if (other.method_.Count != 0) {
           if (result.method_.Count == 0) {
-            result.method_ = new scg::List<self::MethodDescriptorProto>();
+            result.method_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>();
           }
           base.AddRange(other.method_, result.method_);
         }
@@ -3290,13 +3288,13 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
               break;
             }
             case 18: {
-              self::MethodDescriptorProto.Builder subBuilder = self::MethodDescriptorProto.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto.CreateBuilder();
               input.ReadMessage(subBuilder, extensionRegistry);
               AddMethod(subBuilder.BuildPartial());
               break;
             }
             case 26: {
-              self::ServiceOptions.Builder subBuilder = self::ServiceOptions.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.CreateBuilder();
               if (HasOptions) {
                 subBuilder.MergeFrom(Options);
               }
@@ -3329,46 +3327,46 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       // repeated .google.protobuf.MethodDescriptorProto method = 2;
-      public scg::IList<self::MethodDescriptorProto> MethodList {
+      public scg::IList<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto> MethodList {
         get { return pbc::Lists.AsReadOnly(result.method_); }
       }
       public int MethodCount {
         get { return result.MethodCount; }
       }
-      public self::MethodDescriptorProto GetMethod(int index) {
+      public global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto GetMethod(int index) {
         return result.GetMethod(index);
       }
-      public Builder SetMethod(int index, self::MethodDescriptorProto value) {
+      public Builder SetMethod(int index, global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto value) {
         result.method_[index] = value;
         return this;
       }
-      public Builder SetMethod(int index, self::MethodDescriptorProto.Builder builderForValue) {
+      public Builder SetMethod(int index, global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto.Builder builderForValue) {
         result.method_[index] = builderForValue.Build();
         return this;
       }
-      public Builder AddMethod(self::MethodDescriptorProto value) {
-        if (result.method_ == pbc::Lists<self::MethodDescriptorProto>.Empty) {
-          result.method_ = new scg::List<self::MethodDescriptorProto>();
+      public Builder AddMethod(global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto value) {
+        if (result.method_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>.Empty) {
+          result.method_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>();
         }
         result.method_.Add(value);
         return this;
       }
-      public Builder AddMethod(self::MethodDescriptorProto.Builder builderForValue) {
-        if (result.method_ == pbc::Lists<self::MethodDescriptorProto>.Empty) {
-          result.method_ = new scg::List<self::MethodDescriptorProto>();
+      public Builder AddMethod(global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto.Builder builderForValue) {
+        if (result.method_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>.Empty) {
+          result.method_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>();
         }
         result.method_.Add(builderForValue.Build());
         return this;
       }
-      public Builder AddRangeMethod(scg::IEnumerable<self::MethodDescriptorProto> values) {
-        if (result.method_ == pbc::Lists<self::MethodDescriptorProto>.Empty) {
-          result.method_ = new scg::List<self::MethodDescriptorProto>();
+      public Builder AddRangeMethod(scg::IEnumerable<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto> values) {
+        if (result.method_ == pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>.Empty) {
+          result.method_ = new scg::List<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>();
         }
         base.AddRange(values, result.method_);
         return this;
       }
       public Builder ClearMethod() {
-        result.method_ = pbc::Lists<self::MethodDescriptorProto>.Empty;
+        result.method_ = pbc::Lists<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto>.Empty;
         return this;
       }
       
@@ -3376,25 +3374,25 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasOptions {
         get { return result.HasOptions; }
       }
-      public self::ServiceOptions Options {
+      public global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions Options {
         get { return result.Options; }
         set { SetOptions(value); }
       }
-      public Builder SetOptions(self::ServiceOptions value) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions value) {
         result.hasOptions = true;
         result.options_ = value;
         return this;
       }
-      public Builder SetOptions(self::ServiceOptions.Builder builderForValue) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.Builder builderForValue) {
         result.hasOptions = true;
         result.options_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptions(self::ServiceOptions value) {
+      public Builder MergeOptions(global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions value) {
         if (result.HasOptions &&
-            result.options_ != self::ServiceOptions.DefaultInstance) {
+            result.options_ != global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.DefaultInstance) {
           result.options_ =
-            self::ServiceOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
         } else {
           result.options_ = value;
         }
@@ -3403,7 +3401,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       public Builder ClearOptions() {
         result.hasOptions = false;
-        result.options_ = self::ServiceOptions.DefaultInstance;
+        result.options_ = global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.DefaultInstance;
         return this;
       }
     }
@@ -3420,11 +3418,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_MethodDescriptorProto__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_MethodDescriptorProto__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_MethodDescriptorProto__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_MethodDescriptorProto__FieldAccessorTable; }
     }
     
     // optional string name = 1;
@@ -3459,11 +3457,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     // optional .google.protobuf.MethodOptions options = 4;
     private bool hasOptions;
-    private self::MethodOptions options_ = self::MethodOptions.DefaultInstance;
+    private global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions options_ = global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.DefaultInstance;
     public bool HasOptions {
       get { return hasOptions; }
     }
-    public self::MethodOptions Options {
+    public global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions Options {
       get { return options_; }
     }
     
@@ -3514,35 +3512,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::MethodDescriptorProto ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::MethodDescriptorProto ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MethodDescriptorProto ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::MethodDescriptorProto ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MethodDescriptorProto ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::MethodDescriptorProto ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MethodDescriptorProto ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::MethodDescriptorProto ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -3550,26 +3548,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::MethodDescriptorProto prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::MethodDescriptorProto, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::MethodDescriptorProto.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto.CreateBuilder()
       internal Builder() {}
       
-      self::MethodDescriptorProto result = new self::MethodDescriptorProto();
+      global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto result = new global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto();
       
-      protected override self::MethodDescriptorProto MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::MethodDescriptorProto();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto();
         return this;
       }
       
@@ -3578,30 +3576,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::MethodDescriptorProto.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto.Descriptor; }
       }
       
-      public override self::MethodDescriptorProto DefaultInstanceForType {
-        get { return self::MethodDescriptorProto.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto.DefaultInstance; }
       }
       
-      public override self::MethodDescriptorProto BuildPartial() {
-        self::MethodDescriptorProto returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::MethodDescriptorProto) {
-          return MergeFrom((self::MethodDescriptorProto) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::MethodDescriptorProto other) {
-        if (other == self::MethodDescriptorProto.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.MethodDescriptorProto.DefaultInstance) return this;
         if (other.HasName) {
           Name = other.Name;
         }
@@ -3652,7 +3650,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
               break;
             }
             case 34: {
-              self::MethodOptions.Builder subBuilder = self::MethodOptions.CreateBuilder();
+              global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.Builder subBuilder = global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.CreateBuilder();
               if (HasOptions) {
                 subBuilder.MergeFrom(Options);
               }
@@ -3726,25 +3724,25 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasOptions {
         get { return result.HasOptions; }
       }
-      public self::MethodOptions Options {
+      public global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions Options {
         get { return result.Options; }
         set { SetOptions(value); }
       }
-      public Builder SetOptions(self::MethodOptions value) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions value) {
         result.hasOptions = true;
         result.options_ = value;
         return this;
       }
-      public Builder SetOptions(self::MethodOptions.Builder builderForValue) {
+      public Builder SetOptions(global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.Builder builderForValue) {
         result.hasOptions = true;
         result.options_ = builderForValue.Build();
         return this;
       }
-      public Builder MergeOptions(self::MethodOptions value) {
+      public Builder MergeOptions(global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions value) {
         if (result.HasOptions &&
-            result.options_ != self::MethodOptions.DefaultInstance) {
+            result.options_ != global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.DefaultInstance) {
           result.options_ =
-            self::MethodOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
+            global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.CreateBuilder(result.options_).MergeFrom(value).BuildPartial();
         } else {
           result.options_ = value;
         }
@@ -3753,7 +3751,7 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       public Builder ClearOptions() {
         result.hasOptions = false;
-        result.options_ = self::MethodOptions.DefaultInstance;
+        result.options_ = global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.DefaultInstance;
         return this;
       }
     }
@@ -3770,11 +3768,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_FileOptions__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_FileOptions__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_FileOptions__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_FileOptions__FieldAccessorTable; }
     }
     
     #region Nested types
@@ -3819,11 +3817,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = CODE_SIZE];
     private bool hasOptimizeFor;
-    private self::FileOptions.Types.OptimizeMode optimizeFor_ = self::FileOptions.Types.OptimizeMode.CODE_SIZE;
+    private global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode optimizeFor_ = global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode.CODE_SIZE;
     public bool HasOptimizeFor {
       get { return hasOptimizeFor; }
     }
-    public self::FileOptions.Types.OptimizeMode OptimizeFor {  get { return optimizeFor_; }}
+    public global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode OptimizeFor {  get { return optimizeFor_; }}
     
     // optional string csharp_namespace = 1000;
     private bool hasCsharpNamespace;
@@ -3953,35 +3951,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::FileOptions ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileOptions ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FileOptions ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileOptions ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FileOptions ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileOptions ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FileOptions ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileOptions ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FileOptions ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileOptions ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FileOptions ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileOptions ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FileOptions ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileOptions ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FileOptions ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FileOptions ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -3989,26 +3987,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::FileOptions prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.FileOptions prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::FileOptions, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.FileOptions, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::FileOptions.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.CreateBuilder()
       internal Builder() {}
       
-      self::FileOptions result = new self::FileOptions();
+      global::Google.ProtocolBuffers.DescriptorProtos.FileOptions result = new global::Google.ProtocolBuffers.DescriptorProtos.FileOptions();
       
-      protected override self::FileOptions MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.FileOptions MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::FileOptions();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.FileOptions();
         return this;
       }
       
@@ -4017,30 +4015,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::FileOptions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Descriptor; }
       }
       
-      public override self::FileOptions DefaultInstanceForType {
-        get { return self::FileOptions.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.FileOptions DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.DefaultInstance; }
       }
       
-      public override self::FileOptions BuildPartial() {
-        self::FileOptions returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.FileOptions BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.FileOptions returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::FileOptions) {
-          return MergeFrom((self::FileOptions) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.FileOptions) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.FileOptions) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::FileOptions other) {
-        if (other == self::FileOptions.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.FileOptions other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.DefaultInstance) return this;
         if (other.HasJavaPackage) {
           JavaPackage = other.JavaPackage;
         }
@@ -4103,10 +4101,10 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
             }
             case 72: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::FileOptions.Types.OptimizeMode), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode), rawValue)) {
                 unknownFields.MergeVarintField(9, (ulong) rawValue);
               } else {
-                OptimizeFor = (self::FileOptions.Types.OptimizeMode) rawValue;
+                OptimizeFor = (global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode) rawValue;
               }
               break;
             }
@@ -4200,18 +4198,18 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasOptimizeFor {
         get { return result.HasOptimizeFor; }
       }
-      public self::FileOptions.Types.OptimizeMode OptimizeFor {
+      public global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode OptimizeFor {
         get { return result.OptimizeFor; }
         set { SetOptimizeFor(value); }
       }
-      public Builder SetOptimizeFor(self::FileOptions.Types.OptimizeMode value) {
+      public Builder SetOptimizeFor(global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode value) {
         result.hasOptimizeFor = true;
         result.optimizeFor_ = value;
         return this;
       }
       public Builder ClearOptimizeFor() {
         result.hasOptimizeFor = false;
-        result.optimizeFor_ = self::FileOptions.Types.OptimizeMode.CODE_SIZE;
+        result.optimizeFor_ = global::Google.ProtocolBuffers.DescriptorProtos.FileOptions.Types.OptimizeMode.CODE_SIZE;
         return this;
       }
       
@@ -4323,11 +4321,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_MessageOptions__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_MessageOptions__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_MessageOptions__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_MessageOptions__FieldAccessorTable; }
     }
     
     // optional bool message_set_wire_format = 1 [default = false];
@@ -4369,35 +4367,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::MessageOptions ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::MessageOptions ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MessageOptions ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::MessageOptions ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MessageOptions ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::MessageOptions ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MessageOptions ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::MessageOptions ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -4405,26 +4403,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::MessageOptions prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::MessageOptions, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::MessageOptions.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.CreateBuilder()
       internal Builder() {}
       
-      self::MessageOptions result = new self::MessageOptions();
+      global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions result = new global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions();
       
-      protected override self::MessageOptions MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::MessageOptions();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions();
         return this;
       }
       
@@ -4433,30 +4431,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::MessageOptions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.Descriptor; }
       }
       
-      public override self::MessageOptions DefaultInstanceForType {
-        get { return self::MessageOptions.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.DefaultInstance; }
       }
       
-      public override self::MessageOptions BuildPartial() {
-        self::MessageOptions returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::MessageOptions) {
-          return MergeFrom((self::MessageOptions) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::MessageOptions other) {
-        if (other == self::MessageOptions.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.MessageOptions.DefaultInstance) return this;
         if (other.HasMessageSetWireFormat) {
           MessageSetWireFormat = other.MessageSetWireFormat;
         }
@@ -4526,11 +4524,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_FieldOptions__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_FieldOptions__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_FieldOptions__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_FieldOptions__FieldAccessorTable; }
     }
     
     #region Nested types
@@ -4545,11 +4543,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     // optional .google.protobuf.FieldOptions.CType ctype = 1;
     private bool hasCtype;
-    private self::FieldOptions.Types.CType ctype_ = self::FieldOptions.Types.CType.CORD;
+    private global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Types.CType ctype_ = global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Types.CType.CORD;
     public bool HasCtype {
       get { return hasCtype; }
     }
-    public self::FieldOptions.Types.CType Ctype {  get { return ctype_; }}
+    public global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Types.CType Ctype {  get { return ctype_; }}
     
     // optional string experimental_map_key = 9;
     private bool hasExperimentalMapKey;
@@ -4597,35 +4595,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::FieldOptions ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FieldOptions ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FieldOptions ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::FieldOptions ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FieldOptions ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FieldOptions ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::FieldOptions ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::FieldOptions ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -4633,26 +4631,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::FieldOptions prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::FieldOptions, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::FieldOptions.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.CreateBuilder()
       internal Builder() {}
       
-      self::FieldOptions result = new self::FieldOptions();
+      global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions result = new global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions();
       
-      protected override self::FieldOptions MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::FieldOptions();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions();
         return this;
       }
       
@@ -4661,30 +4659,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::FieldOptions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Descriptor; }
       }
       
-      public override self::FieldOptions DefaultInstanceForType {
-        get { return self::FieldOptions.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.DefaultInstance; }
       }
       
-      public override self::FieldOptions BuildPartial() {
-        self::FieldOptions returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::FieldOptions) {
-          return MergeFrom((self::FieldOptions) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::FieldOptions other) {
-        if (other == self::FieldOptions.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.DefaultInstance) return this;
         if (other.HasCtype) {
           Ctype = other.Ctype;
         }
@@ -4718,10 +4716,10 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
             }
             case 8: {
               int rawValue = input.ReadEnum();
-              if (!global::System.Enum.IsDefined(typeof(self::FieldOptions.Types.CType), rawValue)) {
+              if (!global::System.Enum.IsDefined(typeof(global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Types.CType), rawValue)) {
                 unknownFields.MergeVarintField(1, (ulong) rawValue);
               } else {
-                Ctype = (self::FieldOptions.Types.CType) rawValue;
+                Ctype = (global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Types.CType) rawValue;
               }
               break;
             }
@@ -4738,18 +4736,18 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       public bool HasCtype {
         get { return result.HasCtype; }
       }
-      public self::FieldOptions.Types.CType Ctype {
+      public global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Types.CType Ctype {
         get { return result.Ctype; }
         set { SetCtype(value); }
       }
-      public Builder SetCtype(self::FieldOptions.Types.CType value) {
+      public Builder SetCtype(global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Types.CType value) {
         result.hasCtype = true;
         result.ctype_ = value;
         return this;
       }
       public Builder ClearCtype() {
         result.hasCtype = false;
-        result.ctype_ = self::FieldOptions.Types.CType.CORD;
+        result.ctype_ = global::Google.ProtocolBuffers.DescriptorProtos.FieldOptions.Types.CType.CORD;
         return this;
       }
       
@@ -4785,11 +4783,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_EnumOptions__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_EnumOptions__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_EnumOptions__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_EnumOptions__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -4815,35 +4813,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::EnumOptions ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::EnumOptions ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumOptions ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::EnumOptions ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumOptions ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::EnumOptions ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumOptions ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::EnumOptions ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -4851,26 +4849,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::EnumOptions prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::EnumOptions, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::EnumOptions.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.CreateBuilder()
       internal Builder() {}
       
-      self::EnumOptions result = new self::EnumOptions();
+      global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions result = new global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions();
       
-      protected override self::EnumOptions MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::EnumOptions();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions();
         return this;
       }
       
@@ -4879,30 +4877,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::EnumOptions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.Descriptor; }
       }
       
-      public override self::EnumOptions DefaultInstanceForType {
-        get { return self::EnumOptions.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.DefaultInstance; }
       }
       
-      public override self::EnumOptions BuildPartial() {
-        self::EnumOptions returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::EnumOptions) {
-          return MergeFrom((self::EnumOptions) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::EnumOptions other) {
-        if (other == self::EnumOptions.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.EnumOptions.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -4946,11 +4944,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_EnumValueOptions__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_EnumValueOptions__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_EnumValueOptions__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_EnumValueOptions__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -4976,35 +4974,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::EnumValueOptions ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::EnumValueOptions ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumValueOptions ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::EnumValueOptions ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumValueOptions ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::EnumValueOptions ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::EnumValueOptions ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::EnumValueOptions ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -5012,26 +5010,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::EnumValueOptions prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::EnumValueOptions, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::EnumValueOptions.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.CreateBuilder()
       internal Builder() {}
       
-      self::EnumValueOptions result = new self::EnumValueOptions();
+      global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions result = new global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions();
       
-      protected override self::EnumValueOptions MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::EnumValueOptions();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions();
         return this;
       }
       
@@ -5040,30 +5038,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::EnumValueOptions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.Descriptor; }
       }
       
-      public override self::EnumValueOptions DefaultInstanceForType {
-        get { return self::EnumValueOptions.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.DefaultInstance; }
       }
       
-      public override self::EnumValueOptions BuildPartial() {
-        self::EnumValueOptions returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::EnumValueOptions) {
-          return MergeFrom((self::EnumValueOptions) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::EnumValueOptions other) {
-        if (other == self::EnumValueOptions.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.EnumValueOptions.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -5107,11 +5105,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_ServiceOptions__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_ServiceOptions__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_ServiceOptions__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_ServiceOptions__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -5137,35 +5135,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::ServiceOptions ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::ServiceOptions ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ServiceOptions ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::ServiceOptions ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ServiceOptions ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::ServiceOptions ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::ServiceOptions ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::ServiceOptions ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -5173,26 +5171,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::ServiceOptions prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::ServiceOptions, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::ServiceOptions.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.CreateBuilder()
       internal Builder() {}
       
-      self::ServiceOptions result = new self::ServiceOptions();
+      global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions result = new global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions();
       
-      protected override self::ServiceOptions MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::ServiceOptions();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions();
         return this;
       }
       
@@ -5201,30 +5199,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::ServiceOptions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.Descriptor; }
       }
       
-      public override self::ServiceOptions DefaultInstanceForType {
-        get { return self::ServiceOptions.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.DefaultInstance; }
       }
       
-      public override self::ServiceOptions BuildPartial() {
-        self::ServiceOptions returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::ServiceOptions) {
-          return MergeFrom((self::ServiceOptions) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::ServiceOptions other) {
-        if (other == self::ServiceOptions.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.ServiceOptions.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }
@@ -5268,11 +5266,11 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     }
     
     public static pbd::MessageDescriptor Descriptor {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_MethodOptions__Descriptor; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_MethodOptions__Descriptor; }
     }
     
     protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors {
-      get { return self::DescriptorProtoFile.internal__static_google_protobuf_MethodOptions__FieldAccessorTable; }
+      get { return global::Google.ProtocolBuffers.DescriptorProtos.DescriptorProtoFile.internal__static_google_protobuf_MethodOptions__FieldAccessorTable; }
     }
     
     public override bool IsInitialized {
@@ -5298,35 +5296,35 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
     }
     
-    public static self::MethodOptions ParseFrom(pb::ByteString data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions ParseFrom(pb::ByteString data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::MethodOptions ParseFrom(pb::ByteString data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions ParseFrom(pb::ByteString data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MethodOptions ParseFrom(byte[] data) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions ParseFrom(byte[] data) {
       return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
     }
-    public static self::MethodOptions ParseFrom(byte[] data,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions ParseFrom(byte[] data,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MethodOptions ParseFrom(global::System.IO.Stream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions ParseFrom(global::System.IO.Stream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::MethodOptions ParseFrom(
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions ParseFrom(
         global::System.IO.Stream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
     }
-    public static self::MethodOptions ParseFrom(pb::CodedInputStream input) {
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions ParseFrom(pb::CodedInputStream input) {
       return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
     }
-    public static self::MethodOptions ParseFrom(pb::CodedInputStream input,
+    public static global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions ParseFrom(pb::CodedInputStream input,
         pb::ExtensionRegistry extensionRegistry) {
       return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry))
                .BuildParsed();
@@ -5334,26 +5332,26 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
     
     public static Builder CreateBuilder() { return new Builder(); }
     public override Builder CreateBuilderForType() { return new Builder(); }
-    public static Builder CreateBuilder(self::MethodOptions prototype) {
+    public static Builder CreateBuilder(global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions prototype) {
       return (Builder) new Builder().MergeFrom(prototype);
     }
     
-    public sealed partial class Builder : pb::GeneratedBuilder<self::MethodOptions, Builder> {
+    public sealed partial class Builder : pb::GeneratedBuilder<global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions, Builder> {
       protected override Builder ThisBuilder {
         get { return this; }
       }
       
-      // Construct using self::MethodOptions.CreateBuilder()
+      // Construct using global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.CreateBuilder()
       internal Builder() {}
       
-      self::MethodOptions result = new self::MethodOptions();
+      global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions result = new global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions();
       
-      protected override self::MethodOptions MessageBeingBuilt {
+      protected override global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions MessageBeingBuilt {
         get { return result; }
       }
       
       public override Builder Clear() {
-        result = new self::MethodOptions();
+        result = new global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions();
         return this;
       }
       
@@ -5362,30 +5360,30 @@ namespace Google.ProtocolBuffers.DescriptorProtos {
       }
       
       public override pbd::MessageDescriptor DescriptorForType {
-        get { return self::MethodOptions.Descriptor; }
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.Descriptor; }
       }
       
-      public override self::MethodOptions DefaultInstanceForType {
-        get { return self::MethodOptions.DefaultInstance; }
+      public override global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions DefaultInstanceForType {
+        get { return global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.DefaultInstance; }
       }
       
-      public override self::MethodOptions BuildPartial() {
-        self::MethodOptions returnMe = result;
+      public override global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions BuildPartial() {
+        global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions returnMe = result;
         result = null;
         return returnMe;
       }
       
       public override Builder MergeFrom(pb::IMessage other) {
-        if (other is self::MethodOptions) {
-          return MergeFrom((self::MethodOptions) other);
+        if (other is global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions) {
+          return MergeFrom((global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions) other);
         } else {
           base.MergeFrom(other);
           return this;
         }
       }
       
-      public override Builder MergeFrom(self::MethodOptions other) {
-        if (other == self::MethodOptions.DefaultInstance) return this;
+      public override Builder MergeFrom(global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions other) {
+        if (other == global::Google.ProtocolBuffers.DescriptorProtos.MethodOptions.DefaultInstance) return this;
         this.MergeUnknownFields(other.UnknownFields);
         return this;
       }