New options now work fine.

3 files changed, 4 insertions, 12 deletions

diff --git a/src/ProtoGen/ExtensionGenerator.cs b/src/ProtoGen/ExtensionGenerator.cs
index d1acacdf..2f6876c3 100644
--- a/src/ProtoGen/ExtensionGenerator.cs
+++ b/src/ProtoGen/ExtensionGenerator.cs
@@ -9,7 +9,7 @@ namespace Google.ProtocolBuffers.ProtoGen {
     }
 
     public void Generate(TextGenerator writer) {
-      string name = NameHelpers.UnderscoresToPascalCase(GetFieldName(Descriptor));
+      string name = Descriptor.CSharpOptions.PropertyName;
 
       string type;
       switch (Descriptor.MappedType) {
diff --git a/src/ProtoGen/FieldGeneratorBase.cs b/src/ProtoGen/FieldGeneratorBase.cs
index a6e086ed..d20745a4 100644
--- a/src/ProtoGen/FieldGeneratorBase.cs
+++ b/src/ProtoGen/FieldGeneratorBase.cs
@@ -73,17 +73,9 @@ namespace Google.ProtocolBuffers.ProtoGen {
       }
     }
 
-    /// <summary>
-    /// Usually the same as CapitalizedName, except when the enclosing type has the same name,
-    /// in which case an underscore is appended.
-    /// </summary>
     protected string PropertyName {
       get {
-        string ret = CapitalizedName;
-        if (ret == Descriptor.ContainingType.Name) {
-          ret += "_";
-        }
-        return ret;
+        return Descriptor.CSharpOptions.PropertyName;
       }
     }
 
diff --git a/src/ProtoGen/Generator.cs b/src/ProtoGen/Generator.cs
index f7a82cca..828b610c 100644
--- a/src/ProtoGen/Generator.cs
+++ b/src/ProtoGen/Generator.cs
@@ -30,8 +30,8 @@ namespace Google.ProtocolBuffers.ProtoGen {
       foreach (string inputFile in options.InputFiles) {
         FileDescriptorSet descriptorProtos;       
         ExtensionRegistry extensionRegistry = ExtensionRegistry.CreateInstance();
-        extensionRegistry.Add(CSharpFileOptions.CSharpOptions);
-        extensionRegistry.Add(CSharpFieldOptions.CSharpOptions);
+        extensionRegistry.Add(CSharpOptions.CSharpFileOptions);
+        extensionRegistry.Add(CSharpOptions.CSharpFieldOptions);
         using (Stream inputStream = File.OpenRead(inputFile)) {
           descriptorProtos = FileDescriptorSet.ParseFrom(inputStream, extensionRegistry);
         }