3 files changed, 9 insertions, 9 deletions
diff --git a/tools/json_schema_compiler/any_helper.py b/tools/json_schema_compiler/any_helper.py
index 4502dab..a087ffd 100644
--- a/tools/json_schema_compiler/any_helper.py
+++ b/tools/json_schema_compiler/any_helper.py
@@ -16,9 +16,9 @@ class AnyHelper(object):
     dst: Type*
     """
     if any_prop.optional:
-      return '%s->%s->Init(*%s)' % (dst, any_prop.name, src)
+      return '%s->%s->Init(*%s)' % (dst, any_prop.unix_name, src)
     else:
-      return '%s->%s.Init(*%s)' % (dst, any_prop.name, src)
+      return '%s->%s.Init(*%s)' % (dst, any_prop.unix_name, src)
 
   def GetValue(self, any_prop, var):
     """Get |var| as a const Value&.
diff --git a/tools/json_schema_compiler/test/any.json b/tools/json_schema_compiler/test/any.json
index b19db82..02243bb 100644
--- a/tools/json_schema_compiler/test/any.json
+++ b/tools/json_schema_compiler/test/any.json
@@ -21,7 +21,7 @@
         "parameters": [
           {
             "type": "any",
-            "name": "any",
+            "name": "anyName",
             "optional": true
           },
           {
diff --git a/tools/json_schema_compiler/test/any_unittest.cc b/tools/json_schema_compiler/test/any_unittest.cc
index fc6ae4a..0780230 100644
--- a/tools/json_schema_compiler/test/any_unittest.cc
+++ b/tools/json_schema_compiler/test/any_unittest.cc
@@ -33,7 +33,7 @@ TEST(JsonSchemaCompilerAnyTest, OptionalAnyParamsCreate) {
     scoped_ptr<OptionalAny::Params> params(
         OptionalAny::Params::Create(*params_value));
     EXPECT_TRUE(params.get());
-    EXPECT_FALSE(params->any.get());
+    EXPECT_FALSE(params->any_name.get());
   }
   {
     scoped_ptr<ListValue> params_value(new ListValue());
@@ -42,8 +42,8 @@ TEST(JsonSchemaCompilerAnyTest, OptionalAnyParamsCreate) {
     scoped_ptr<OptionalAny::Params> params(
         OptionalAny::Params::Create(*params_value));
     EXPECT_TRUE(params.get());
-    EXPECT_TRUE(params->any.get());
-    EXPECT_TRUE(params->any->value().Equals(param.get()));
+    EXPECT_TRUE(params->any_name.get());
+    EXPECT_TRUE(params->any_name->value().Equals(param.get()));
   }
   {
     scoped_ptr<ListValue> params_value(new ListValue());
@@ -52,8 +52,8 @@ TEST(JsonSchemaCompilerAnyTest, OptionalAnyParamsCreate) {
     scoped_ptr<OptionalAny::Params> params(
         OptionalAny::Params::Create(*params_value));
     EXPECT_TRUE(params.get());
-    EXPECT_TRUE(params->any.get());
-    EXPECT_TRUE(params->any.get());
-    EXPECT_TRUE(params->any->value().Equals(param.get()));
+    EXPECT_TRUE(params->any_name.get());
+    EXPECT_TRUE(params->any_name.get());
+    EXPECT_TRUE(params->any_name->value().Equals(param.get()));
   }
 }