diff --git a/data-avro-generator/build.gradle b/data-avro-generator/build.gradle
index ee9df9bc08..b051678380 100644
--- a/data-avro-generator/build.gradle
+++ b/data-avro-generator/build.gradle
@@ -2,6 +2,7 @@ dependencies {
   compile project(':data')
   compile project(':data-avro')
   compile externalDependency.avro
+  compile externalDependency.skyScreamer
   testCompile project(path: ':data', configuration: 'testArtifacts')
   testCompile externalDependency.testng
 }
diff --git a/data-avro-generator/src/main/java/com/linkedin/data/avro/generator/AvroSchemaGenerator.java b/data-avro-generator/src/main/java/com/linkedin/data/avro/generator/AvroSchemaGenerator.java
index 0d90e6efc7..ca89081d8e 100644
--- a/data-avro-generator/src/main/java/com/linkedin/data/avro/generator/AvroSchemaGenerator.java
+++ b/data-avro-generator/src/main/java/com/linkedin/data/avro/generator/AvroSchemaGenerator.java
@@ -44,10 +44,17 @@
 import java.util.Set;
 
 import java.util.stream.Collectors;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.skyscreamer.jsonassert.Customization;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
+import org.skyscreamer.jsonassert.JSONParser;
+import org.skyscreamer.jsonassert.comparator.CustomComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.linkedin.data.avro.SchemaTranslator.AVRO_PREFIX;
+import static com.linkedin.data.avro.SchemaTranslator.*;
 
 
 /**
@@ -162,7 +169,11 @@ public static void run(String resolverPath,
     {
       targetDirectoryPath += "/" + AVRO_PREFIX;
     }
-    generator.generate(targetDirectoryPath, sources);
+    try {
+      generator.generate(targetDirectoryPath, sources);
+    } catch (JSONException e) {
+      throw new RuntimeException(e);
+    }
   }
 
   /**
@@ -180,8 +191,7 @@ public DataToAvroSchemaTranslationOptions getDataToAvroSchemaTranslationOptions(
    * @param targetDirectoryPath path to target root java source directory
    * @throws IOException if there are problems opening or deleting files.
    */
-  private void generate(String targetDirectoryPath, String[] sources) throws IOException
-  {
+  private void generate(String targetDirectoryPath, String[] sources) throws IOException, JSONException {
     initSchemaResolver();
 
     _fileToAvroSchemaMap.clear();
@@ -242,8 +252,7 @@ protected void outputAvroSchemas(File targetDirectory) throws IOException
     }
   }
 
-  protected List<File> targetFiles(File targetDirectory)
-  {
+  protected List<File> targetFiles(File targetDirectory) throws JSONException {
     ArrayList<File> generatedFiles = new ArrayList<>();
 
     DataSchemaResolver resolver = getSchemaResolver();
@@ -267,7 +276,14 @@ protected List<File> targetFiles(File targetDirectory)
           String avroSchemaText = SchemaTranslator.dataToAvroSchemaJson(recordDataSchema, _options);
           _fileToAvroSchemaMap.put(generatedFile, avroSchemaText);
           String postTranslateSchemaText = recordDataSchema.toString();
-          assert(preTranslateSchemaText.equals(postTranslateSchemaText));
+
+          // JSON compare except TRANSLATED_FROM_SOURCE_OPTION in root
+          JSONAssert.assertEquals(preTranslateSchemaText, postTranslateSchemaText,
+              new CustomComparator(JSONCompareMode.LENIENT,
+                  new Customization(TRANSLATED_FROM_SOURCE_OPTION, (o1, o2) -> true)));
+
+          assert (((JSONObject) JSONParser.parseJSON(postTranslateSchemaText)).get(TRANSLATED_FROM_SOURCE_OPTION)
+              != null);
         }
       }
     }
diff --git a/data-avro-generator/src/test/java/com/linkedin/data/avro/generator/TestAvroSchemaGenerator.java b/data-avro-generator/src/test/java/com/linkedin/data/avro/generator/TestAvroSchemaGenerator.java
index 79c23974fd..86c6bccc1c 100644
--- a/data-avro-generator/src/test/java/com/linkedin/data/avro/generator/TestAvroSchemaGenerator.java
+++ b/data-avro-generator/src/test/java/com/linkedin/data/avro/generator/TestAvroSchemaGenerator.java
@@ -34,14 +34,19 @@
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Parser;
 import org.apache.commons.compress.utils.IOUtils;
+import org.json.JSONException;
+import org.skyscreamer.jsonassert.Customization;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
+import org.skyscreamer.jsonassert.comparator.CustomComparator;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import static com.linkedin.data.TestUtil.*;
+import static com.linkedin.data.avro.SchemaTranslator.*;
 import static com.linkedin.data.avro.generator.AvroSchemaGenerator.GENERATOR_AVRO_NAMESPACE_OVERRIDE;
-import static com.linkedin.data.avro.SchemaTranslator.AVRO_PREFIX;
 import static com.linkedin.data.schema.generator.AbstractGenerator.GENERATOR_RESOLVER_PATH;
 import static com.linkedin.util.FileUtil.buildSystemIndependentPath;
 import static org.testng.Assert.assertEquals;
@@ -175,8 +180,8 @@ public Object[][] toAvroSchemaData()
   }
 
   @Test(dataProvider = "toAvroSchemaData")
-  public void testFileNameAsArgs(Map<String, String> testSchemas, Map<String, String> expectedAvroSchemas, List<String> paths, boolean override) throws IOException
-  {
+  public void testFileNameAsArgs(Map<String, String> testSchemas, Map<String, String> expectedAvroSchemas, List<String> paths, boolean override)
+      throws IOException, JSONException {
     Map<File, Map.Entry<String,String>>  files = TestUtil.createSchemaFiles(_testDir, testSchemas, _debug);
     // directory in path
     Collection<String> testPaths = computePathFromRelativePaths(_testDir, paths);
@@ -193,8 +198,8 @@ public void testFileNameAsArgs(Map<String, String> testSchemas, Map<String, Stri
   }
 
   @Test(dataProvider = "toAvroSchemaData")
-  public void testFullNameAsArgsWithJarInPath(Map<String, String> testSchemas, Map<String, String> expectedAvroSchemas, List<String> paths, boolean override) throws IOException
-  {
+  public void testFullNameAsArgsWithJarInPath(Map<String, String> testSchemas, Map<String, String> expectedAvroSchemas, List<String> paths, boolean override)
+      throws IOException, JSONException {
     Map<File, Map.Entry<String,String>>  files = TestUtil.createSchemaFiles(_testDir, testSchemas, _debug);
     // jar files in path, create jar files
     Collection<String> testPaths = createJarsFromRelativePaths(_testDir, testSchemas, paths, _debug);
@@ -324,8 +329,8 @@ private File setup(Collection<String> paths, boolean override) throws IOExceptio
     return targetDir;
   }
 
-  private void run(String[] args, Map.Entry<File, Map.Entry<String, String>> entry, File targetDir, Map<String, String> expectedAvroSchemas) throws IOException
-  {
+  private void run(String[] args, Map.Entry<File, Map.Entry<String, String>> entry, File targetDir, Map<String, String> expectedAvroSchemas)
+      throws IOException, JSONException {
     Exception exc = null;
     try
     {
@@ -359,7 +364,11 @@ private void run(String[] args, Map.Entry<File, Map.Entry<String, String>> entry
       assertFalse(avroSchema.isError());
       String avroSchemaText = avroSchema.toString();
       if (_debug) out.println(avroSchemaText);
-      assertEquals(avroSchemaText, expectedAvroSchemas.get(pdscFileName));
+
+      // JSON compare except TRANSLATED_FROM_SOURCE_OPTION in root
+      JSONAssert.assertEquals(expectedAvroSchemas.get(pdscFileName), avroSchemaText,
+          new CustomComparator(JSONCompareMode.LENIENT,
+              new Customization(TRANSLATED_FROM_SOURCE_OPTION, (o1, o2) -> true)));
     }
   }
 }
diff --git a/data-avro/src/main/java/com/linkedin/data/avro/SchemaTranslator.java b/data-avro/src/main/java/com/linkedin/data/avro/SchemaTranslator.java
index fc209aa2b6..f561fd7d6a 100644
--- a/data-avro/src/main/java/com/linkedin/data/avro/SchemaTranslator.java
+++ b/data-avro/src/main/java/com/linkedin/data/avro/SchemaTranslator.java
@@ -58,7 +58,7 @@ public class SchemaTranslator
   private static final Logger log = LoggerFactory.getLogger(SchemaTranslator.class);
 
   public static final String DATA_PROPERTY = "com.linkedin.data";
-  public static final String TRANSLATED_FROM_SOURCE_OPTION = "li.data.translated.from";
+  public static final String TRANSLATED_FROM_SOURCE_OPTION = "schema.translated.from.src";
   public static final String SCHEMA_PROPERTY = "schema";
   public static final String OPTIONAL_DEFAULT_MODE_PROPERTY = "optionalDefaultMode";
   public static final String AVRO_FILE_EXTENSION = ".avsc";
diff --git a/data-avro/src/test/java/com/linkedin/data/avro/TestFilteredSchemaDataTranslation.java b/data-avro/src/test/java/com/linkedin/data/avro/TestFilteredSchemaDataTranslation.java
index 3ebfec732c..5f60f1ac70 100644
--- a/data-avro/src/test/java/com/linkedin/data/avro/TestFilteredSchemaDataTranslation.java
+++ b/data-avro/src/test/java/com/linkedin/data/avro/TestFilteredSchemaDataTranslation.java
@@ -137,7 +137,7 @@ public void testFilteredDataSchemaDataTranslation() throws IOException
         "{ " +
         "  \"type\" : \"record\", " +
         "  \"name\" : \"Foo\", " +
-        "  \"li.data.translated.from\" : \"Foo\", " +
+        "  \"schema.translated.from.src\" : \"Foo\", " +
         "  \"fields\" : [ " +
         "    { \"name\" : \"a\", \"type\" : \"int\" }, " +
         "    { \"name\" : \"b\", \"type\" : \"int\", \"optional\" : true } " +
diff --git a/data-avro/src/test/java/com/linkedin/data/avro/TestSchemaTranslator.java b/data-avro/src/test/java/com/linkedin/data/avro/TestSchemaTranslator.java
index fd60302f90..b005b105bf 100644
--- a/data-avro/src/test/java/com/linkedin/data/avro/TestSchemaTranslator.java
+++ b/data-avro/src/test/java/com/linkedin/data/avro/TestSchemaTranslator.java
@@ -103,7 +103,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagationUnionWithAlias
                 "{" +
                     "  \"type\": \"record\"," +
                     "  \"name\": \"test\"," +
-                    "  \"li.data.translated.from\" : \"test\"," +
+                    "  \"schema.translated.from.src\" : \"test\"," +
                     "  \"fields\": [" +
                     "    {" +
                     "      \"name\": \"unionWithAliasField\"," +
@@ -163,7 +163,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagationUnionWithAlias
                 "{" +
                     "  \"type\": \"record\"," +
                     "  \"name\": \"test\"," +
-                    "  \"li.data.translated.from\" : \"test\"," +
+                    "  \"schema.translated.from.src\" : \"test\"," +
                     "  \"fields\": [" +
                     "    {" +
                     "      \"name\": \"unionTyperef\"," +
@@ -228,7 +228,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagationUnionWithAlias
                 "{" +
                     "  \"type\": \"record\"," +
                     "  \"name\": \"test\"," +
-                    "  \"li.data.translated.from\" : \"test\"," +
+                    "  \"schema.translated.from.src\" : \"test\"," +
                     "  \"fields\": [" +
                     "    {" +
                     "      \"name\": \"unionTyperef\"," +
@@ -292,7 +292,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagationUnionWithAlias
                 "{" +
                     "  \"type\": \"record\"," +
                     "  \"name\": \"test\"," +
-                    "  \"li.data.translated.from\" : \"test\"," +
+                    "  \"schema.translated.from.src\" : \"test\"," +
                     "  \"fields\": [" +
                     "    {" +
                     "      \"name\": \"unionTyperef\"," +
@@ -352,7 +352,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagationUnionWithAlias
                 "{" +
                     "    \"type\": \"record\"," +
                     "    \"name\": \"test\"," +
-                    "    \"li.data.translated.from\" : \"test\"," +
+                    "    \"schema.translated.from.src\" : \"test\"," +
                     "    \"fields\": [" +
                     "        {" +
                     "            \"name\": \"unionTyperef\"," +
@@ -380,7 +380,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagationUnionWithAlias
                 "{" +
                     "    \"type\": \"record\"," +
                     "    \"name\": \"test\"," +
-                    "    \"li.data.translated.from\" : \"test\"," +
+                    "    \"schema.translated.from.src\" : \"test\"," +
                     "    \"fields\": [" +
                     "        {" +
                     "            \"name\": \"unionTyperef\"," +
@@ -442,7 +442,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagationUnionWithAlias
                 "{" +
                     "    \"type\": \"record\"," +
                     "    \"name\": \"test\"," +
-                    "    \"li.data.translated.from\" : \"test\"," +
+                    "    \"schema.translated.from.src\" : \"test\"," +
                     "    \"fields\": [" +
                     "        {" +
                     "            \"name\": \"unionTyperef\"," +
@@ -503,7 +503,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagationUnionWithAlias
                 "{" +
                     "    \"type\": \"record\"," +
                     "    \"name\": \"test\"," +
-                    "    \"li.data.translated.from\" : \"test\"," +
+                    "    \"schema.translated.from.src\" : \"test\"," +
                     "    \"fields\": [" +
                     "        {" +
                     "            \"name\": \"unionTyperef\"," +
@@ -560,7 +560,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagationUnionWithAlias
                 "{" +
                     "    \"type\": \"record\"," +
                     "    \"name\": \"test\"," +
-                    "    \"li.data.translated.from\" : \"test\"," +
+                    "    \"schema.translated.from.src\" : \"test\"," +
                     "    \"fields\": [" +
                     "        {" +
                     "            \"name\": \"unionTyperef\"," +
@@ -631,7 +631,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagation()
                "             \"ref\"  : \"string\", " +
                "             \"compliance\" : [{\"dataType\":\"MEMBER_NAME\", \"format\": \"STRING\"}] } }] }",
 
-               "{ \"type\" : \"record\", \"li.data.translated.from\" : \"com.x.y.z.Foo\", \"name\" : \"Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefField\", \"type\" : \"string\", \"compliance\" : [ { \"dataType\" : \"MEMBER_NAME\", \"format\" : \"STRING\" } ] } ] }"
+               "{ \"type\" : \"record\", \"schema.translated.from.src\" : \"com.x.y.z.Foo\", \"name\" : \"Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefField\", \"type\" : \"string\", \"compliance\" : [ { \"dataType\" : \"MEMBER_NAME\", \"format\" : \"STRING\" } ] } ] }"
            },
            {
                // Test Annotations propagation for TypeRef, reserved word, such as "validate", "java", should not be propagated
@@ -665,7 +665,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagation()
 
                "{ \"type\" : \"record\", " +
                "\"name\" : \"Foo\", " +
-               "\"li.data.translated.from\" : \"com.x.y.z.Foo\", " +
+               "\"schema.translated.from.src\" : \"com.x.y.z.Foo\", " +
                "\"namespace\" : \"com.x.y.z\", " +
                "\"fields\" : [ " +
                "{ \"name\" : \"typedefField\", " +
@@ -690,7 +690,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagation()
 
                "{ \"type\" : \"record\", " +
                "\"name\" : \"Foo\", " +
-               "\"li.data.translated.from\" : \"com.x.y.z.Foo\", " +
+               "\"schema.translated.from.src\" : \"com.x.y.z.Foo\", " +
                "\"namespace\" : \"com.x.y.z\", " +
                "\"fields\" : [ { " +
                "\"name\" : \"typedefField\", " +
@@ -719,7 +719,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagation()
                "                                         \"ref\"  : \"int\", " +
                "\"compliance\" : [{\"dataType\":\"MEMBER_NAME\", \"format\": \"INTEGER\"}] } } }] }",
 
-               "{ \"type\" : \"record\", \"li.data.translated.from\" : \"com.x.y.z.Foo\", \"name\" : \"Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefField\", \"type\" : \"int\", \"compliance\" : [ { \"dataType\" : \"MEMBER_NAME\", \"format\" : \"INTEGER\" } ] } ] }",
+               "{ \"type\" : \"record\", \"schema.translated.from.src\" : \"com.x.y.z.Foo\", \"name\" : \"Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefField\", \"type\" : \"int\", \"compliance\" : [ { \"dataType\" : \"MEMBER_NAME\", \"format\" : \"INTEGER\" } ] } ] }",
            },
            {
                // Test Annotations for TypeRef : three layer typerefs
@@ -739,7 +739,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagation()
 
                "{ \"type\" : \"record\", " +
                "\"name\" : \"Foo\", " +
-               "\"li.data.translated.from\" : \"com.x.y.z.Foo\","+
+               "\"schema.translated.from.src\" : \"com.x.y.z.Foo\","+
                "\"namespace\" : \"com.x.y.z\", " +
                "\"fields\" : [ " + "{ " +
                "\"name\" : \"typedefField\", " +
@@ -768,7 +768,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagation()
                "  ]\n" +
                "}",
 
-               "{ \"type\" : \"record\", \"name\" : \"Foo\", \"li.data.translated.from\" : \"com.x.y.z.Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefMapField\", \"type\" : { \"type\" : \"map\", \"values\" : \"string\" }, \"compliance\" : { \"keysymbol\" : [ { \"dataType\" : \"MEMBER_NAME\" } ], \"/*\" : [ { \"dataType\" : \"MEMBER_ID\" } ] } } ] }",
+               "{ \"type\" : \"record\", \"name\" : \"Foo\", \"schema.translated.from.src\" : \"com.x.y.z.Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefMapField\", \"type\" : { \"type\" : \"map\", \"values\" : \"string\" }, \"compliance\" : { \"keysymbol\" : [ { \"dataType\" : \"MEMBER_NAME\" } ], \"/*\" : [ { \"dataType\" : \"MEMBER_ID\" } ] } } ] }",
            },
            {
                // Test Annotations for TypeRef : one layer typeref, with field level has same property as Typeref and merged
@@ -791,7 +791,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagation()
                "  ]\n" +
                "}",
 
-               "{ \"type\" : \"record\", \"name\" : \"Foo\", \"li.data.translated.from\" : \"com.x.y.z.Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefMapField\", \"type\" : { \"type\" : \"map\", \"values\" : \"string\" }, \"compliance\" : { \"keysymbol\" : [ { \"dataType\" : \"MEMBER_NAME\" } ], \"/*\" : [ { \"dataType\" : \"MEMBER_ID\" } ] } } ] }",
+               "{ \"type\" : \"record\", \"name\" : \"Foo\", \"schema.translated.from.src\" : \"com.x.y.z.Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefMapField\", \"type\" : { \"type\" : \"map\", \"values\" : \"string\" }, \"compliance\" : { \"keysymbol\" : [ { \"dataType\" : \"MEMBER_NAME\" } ], \"/*\" : [ { \"dataType\" : \"MEMBER_ID\" } ] } } ] }",
            },
            {
                // Test Annotations for TypeRef : one layer typeref, with field level has same property's override and not merged
@@ -816,7 +816,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagation()
 
                "{ \"type\" : \"record\", " +
                "\"name\" : \"Foo\", " +
-               "\"li.data.translated.from\" : \"com.x.y.z.Foo\", " +
+               "\"schema.translated.from.src\" : \"com.x.y.z.Foo\", " +
                "\"namespace\" : \"com.x.y.z\", " +
                "\"fields\" : [ { \"name\" : \"typedefMapField\", " +
                "\"type\" : { \"type\" : \"map\", \"values\" : \"string\" }, " +
@@ -843,7 +843,7 @@ public Object[][] toAvroSchemaDataTestTypeRefAnnotationPropagation()
                "  ]\n" +
                "}",
 
-               "{ \"type\" : \"record\", \"name\" : \"Foo\", \"li.data.translated.from\":\"com.x.y.z.Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefMapField\", \"type\" : { \"type\" : \"map\", \"values\" : \"string\" }, \"otherannotation\" : \"None\", \"compliance\" : { \"/*\" : [ { \"dataType\" : \"MEMBER_ID\" } ] } } ] }",
+               "{ \"type\" : \"record\", \"name\" : \"Foo\", \"schema.translated.from.src\":\"com.x.y.z.Foo\", \"namespace\" : \"com.x.y.z\", \"fields\" : [ { \"name\" : \"typedefMapField\", \"type\" : { \"type\" : \"map\", \"values\" : \"string\" }, \"otherannotation\" : \"None\", \"compliance\" : { \"/*\" : [ { \"dataType\" : \"MEMBER_ID\" } ] } } ] }",
            }
 
        };
@@ -915,7 +915,7 @@ public Object[][] toAvroSchemaData()
               // custom properties :
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START \"int\" ##T_END } ], \"version\" : 1 }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\" } ], \"version\" : 1 }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\" } ], \"version\" : 1 }",
               null,
               null,
               null
@@ -924,7 +924,7 @@ public Object[][] toAvroSchemaData()
               // required, optional not specified
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START \"int\" ##T_END } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\" } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\" } ] }",
               null,
               null,
               null
@@ -933,7 +933,7 @@ public Object[][] toAvroSchemaData()
               // required and has default
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START \"int\" ##T_END, \"default\" : 42 } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\", \"default\" : 42 } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\", \"default\" : 42 } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -942,7 +942,7 @@ public Object[][] toAvroSchemaData()
               // required, optional is false
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START \"int\" ##T_END, \"optional\" : false } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\" } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\" } ] }",
               null,
               null,
               null
@@ -951,7 +951,7 @@ public Object[][] toAvroSchemaData()
               // required, optional is false and has default
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START \"int\" ##T_END, \"default\" : 42, \"optional\" : false } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\", \"default\" : 42 } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\", \"default\" : 42 } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -960,7 +960,7 @@ public Object[][] toAvroSchemaData()
               // optional is true
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START \"int\" ##T_END, \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -969,7 +969,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START \"int\" ##T_END, \"optional\" : true, \"default\" : 42 } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\" ], \"default\" : 42 } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\" ], \"default\" : 42 } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -978,7 +978,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START \"int\" ##T_END, \"optional\" : true, \"default\" : 42 } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -987,7 +987,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default, enum type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"enum\", \"name\" : \"fruits\", \"symbols\" : [ \"APPLE\", \"ORANGE\" ] } ##T_END, \"optional\" : true, \"default\" : \"APPLE\" } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"enum\", \"name\" : \"fruits\", \"symbols\" : [ \"APPLE\", \"ORANGE\" ] }, \"null\" ], \"default\" : \"APPLE\" } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"enum\", \"name\" : \"fruits\", \"symbols\" : [ \"APPLE\", \"ORANGE\" ] }, \"null\" ], \"default\" : \"APPLE\" } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -996,7 +996,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default, enum type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"enum\", \"name\" : \"fruits\", \"symbols\" : [ \"APPLE\", \"ORANGE\" ] } ##T_END, \"optional\" : true, \"default\" : \"APPLE\" } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"enum\", \"name\" : \"fruits\", \"symbols\" : [ \"APPLE\", \"ORANGE\" ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"enum\", \"name\" : \"fruits\", \"symbols\" : [ \"APPLE\", \"ORANGE\" ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1005,7 +1005,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default with namespaced type
               "{ \"type\" : \"record\", \"name\" : \"a.b.foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"record\", \"name\" : \"b.c.bar\", \"fields\" : [ ] } ##T_END, \"default\" : {  }, \"optional\" : true } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"a.b.foo\", \"namespace\" : \"a.b\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"bar\", \"namespace\" : \"b.c\", \"fields\" : [  ] }, \"null\" ], \"default\" : {  } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"a.b.foo\", \"namespace\" : \"a.b\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"bar\", \"namespace\" : \"b.c\", \"fields\" : [  ] }, \"null\" ], \"default\" : {  } } ] }",
               "{ \"type\" : \"record\", \"name\" : \"a.b.foo\", \"fields\" : [ ] }",
               emptyFooValue,
               null
@@ -1014,7 +1014,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default with namespaced type
               "{ \"type\" : \"record\", \"name\" : \"a.b.foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"record\", \"name\" : \"b.c.bar\", \"fields\" : [ ] } ##T_END, \"default\" : {  }, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"a.b.foo\", \"namespace\" : \"a.b\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"bar\", \"namespace\" : \"b.c\", \"fields\" : [  ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"a.b.foo\", \"namespace\" : \"a.b\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"bar\", \"namespace\" : \"b.c\", \"fields\" : [  ] } ], \"default\" : null } ] }",
               "{ \"type\" : \"record\", \"name\" : \"a.b.foo\", \"fields\" : [ ] }",
               emptyFooValue,
               null
@@ -1023,7 +1023,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default value with multi-level nesting
               "{ \"type\" : \"record\", \"name\" : \"a.b.foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"record\", \"name\" : \"b.c.bar\", \"fields\" : [ { \"name\" : \"baz\", \"type\" : { \"type\" : \"record\", \"name\" : \"c.d.baz\", \"fields\" : [ ] } } ] }, \"default\" : { \"baz\" : { } }, \"optional\" : true } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"a.b.foo\", \"namespace\" : \"a.b\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"bar\", \"namespace\" : \"b.c\", \"fields\" : [ { \"name\" : \"baz\", \"type\" : { \"type\" : \"record\", \"name\" : \"baz\", \"namespace\" : \"c.d\", \"fields\" : [  ] } } ] }, \"null\" ], \"default\" : { \"baz\" : {  } } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"a.b.foo\", \"namespace\" : \"a.b\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"bar\", \"namespace\" : \"b.c\", \"fields\" : [ { \"name\" : \"baz\", \"type\" : { \"type\" : \"record\", \"name\" : \"baz\", \"namespace\" : \"c.d\", \"fields\" : [  ] } } ] }, \"null\" ], \"default\" : { \"baz\" : {  } } } ] }",
               "{ \"type\" : \"record\", \"name\" : \"a.b.foo\", \"fields\" : [ ] }",
               emptyFooValue,
               null
@@ -1032,7 +1032,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default value with multi-level nesting
               "{ \"type\" : \"record\", \"name\" : \"a.b.foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"record\", \"name\" : \"b.c.bar\", \"fields\" : [ { \"name\" : \"baz\", \"type\" : { \"type\" : \"record\", \"name\" : \"c.d.baz\", \"fields\" : [ ] } } ] }, \"default\" : { \"baz\" : { } }, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"a.b.foo\", \"namespace\" : \"a.b\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"bar\", \"namespace\" : \"b.c\", \"fields\" : [ { \"name\" : \"baz\", \"type\" : { \"type\" : \"record\", \"name\" : \"baz\", \"namespace\" : \"c.d\", \"fields\" : [  ] } } ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"a.b.foo\", \"namespace\" : \"a.b\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"bar\", \"namespace\" : \"b.c\", \"fields\" : [ { \"name\" : \"baz\", \"type\" : { \"type\" : \"record\", \"name\" : \"baz\", \"namespace\" : \"c.d\", \"fields\" : [  ] } } ] } ], \"default\" : null } ] }",
               "{ \"type\" : \"record\", \"name\" : \"a.b.foo\", \"fields\" : [ ] }",
               emptyFooValue,
               null
@@ -1041,7 +1041,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default but with circular references with inconsistent defaults, inconsistent because optional field has default, and also missing (which requires default to be null)
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"foo\", \"default\" : {  }, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"foo\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"foo\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1050,7 +1050,7 @@ public Object[][] toAvroSchemaData()
               // optional and has default but with circular references with inconsistent defaults, inconsistent because optional field has default, and also missing (which requires default to be null)
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"foo\", \"default\" : { \"bar\" : {  } }, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"foo\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"foo\" ], \"default\" : null } ] }",
               null,
               null,
               null
@@ -1059,7 +1059,7 @@ public Object[][] toAvroSchemaData()
               // required union without null
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"int\", \"string\" ] ##T_END } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"string\" ] } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"string\" ] } ] }",
               null,
               null,
               null
@@ -1068,7 +1068,7 @@ public Object[][] toAvroSchemaData()
               // required union with null
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"null\", \"string\" ] ##T_END } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"string\" ] } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"string\" ] } ] }",
               null,
               null,
               null
@@ -1077,7 +1077,7 @@ public Object[][] toAvroSchemaData()
               // optional union without null
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"int\", \"string\" ] ##T_END, \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1086,7 +1086,7 @@ public Object[][] toAvroSchemaData()
               // optional union with null
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"null\", \"int\", \"string\" ] ##T_END, \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1095,7 +1095,7 @@ public Object[][] toAvroSchemaData()
               // optional union without null and default is 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"int\", \"string\" ] ##T_END, \"default\" : { \"int\" : 42 }, \"optional\" : true } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"li.data.translated.from\" : \"foo\",\"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"string\", \"null\" ], \"default\" : 42 } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"schema.translated.from.src\" : \"foo\",\"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"string\", \"null\" ], \"default\" : 42 } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1104,7 +1104,7 @@ public Object[][] toAvroSchemaData()
               // optional union without null and default is 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"int\", \"string\" ] ##T_END, \"default\" : { \"int\" : 42 }, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\",  \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1113,7 +1113,7 @@ public Object[][] toAvroSchemaData()
               // optional union without null and default is 2nd member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"int\", \"string\" ] ##T_END, \"default\" : { \"string\" : \"abc\" }, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1122,7 +1122,7 @@ public Object[][] toAvroSchemaData()
               // optional union with null and non-null default, default is 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"int\", \"null\", \"string\" ] ##T_END, \"default\" : { \"int\" : 42 }, \"optional\" : true } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\", \"string\" ], \"default\" : 42 } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\", \"string\" ], \"default\" : 42 } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1131,7 +1131,7 @@ public Object[][] toAvroSchemaData()
               // optional union with null and non-null default, default is 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"int\", \"null\", \"string\" ] ##T_END, \"default\" : { \"int\" : 42 }, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1140,7 +1140,7 @@ public Object[][] toAvroSchemaData()
               // optional union with null and non-null default, default is 2nd member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"int\", \"null\", \"string\" ] ##T_END, \"default\" : null, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1149,7 +1149,7 @@ public Object[][] toAvroSchemaData()
               // optional union with null and non-null default, default is 3rd member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"int\", \"null\", \"string\" ] ##T_END, \"default\" : { \"string\" : \"abc\" }, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1158,7 +1158,7 @@ public Object[][] toAvroSchemaData()
               // optional union with null and null default, default is 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"null\", \"int\", \"string\" ] ##T_END, \"default\" : null, \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1167,7 +1167,7 @@ public Object[][] toAvroSchemaData()
               // optional union but with circular references with inconsistent defaults, inconsistent because optional field has default, and also missing (which requires default to be null)
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"foo\", \"string\" ] ##T_END, \"default\" : { \"foo\" : { } }, \"optional\" : true } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"foo\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"foo\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1176,7 +1176,7 @@ public Object[][] toAvroSchemaData()
               // optional union but with circular references with but with consistent defaults (the only default that works is null for circularly referenced unions)
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START [ \"null\", \"foo\" ] ##T_END, \"default\" : null, \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"foo\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"foo\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1185,7 +1185,7 @@ public Object[][] toAvroSchemaData()
               // typeref of fixed
               "##T_START { \"type\" : \"record\", \"name\" : \"Foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\" } ] } ##T_END",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"Foo\", \"li.data.translated.from\" : \"Foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\" } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"Foo\", \"schema.translated.from.src\" : \"Foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : \"int\" } ] }",
               null,
               null,
               null
@@ -1194,7 +1194,7 @@ public Object[][] toAvroSchemaData()
               // typeref of enum
               "##T_START { \"type\" : \"enum\", \"name\" : \"Fruits\", \"symbols\" : [ \"APPLE\", \"ORANGE\" ] } ##T_END",
               allModes,
-              "{ \"type\" : \"enum\", \"name\" : \"Fruits\", \"li.data.translated.from\" : \"Fruits\",  \"symbols\" : [ \"APPLE\", \"ORANGE\" ] }",
+              "{ \"type\" : \"enum\", \"name\" : \"Fruits\", \"schema.translated.from.src\" : \"Fruits\",  \"symbols\" : [ \"APPLE\", \"ORANGE\" ] }",
               null,
               null,
               null
@@ -1203,7 +1203,7 @@ public Object[][] toAvroSchemaData()
               // typeref of fixed
               "##T_START { \"type\" : \"fixed\", \"name\" : \"Md5\", \"size\" : 16 } ##T_END",
               allModes,
-              "{ \"type\" : \"fixed\", \"name\" : \"Md5\", \"li.data.translated.from\" : \"Md5\", \"size\" : 16 }",
+              "{ \"type\" : \"fixed\", \"name\" : \"Md5\", \"schema.translated.from.src\" : \"Md5\", \"size\" : 16 }",
               null,
               null,
               null
@@ -1266,7 +1266,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, without null in record field
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", ##T_START \"int\" ##T_END ] } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", \"int\" ] } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", \"int\" ] } ] }",
               null,
               null,
               null
@@ -1275,7 +1275,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, without null and default is 1st member type and not typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", ##T_START \"int\" ##T_END ], \"default\" : { \"string\" : \"abc\" } } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", \"int\" ], \"default\" : \"abc\" } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", \"int\" ], \"default\" : \"abc\" } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1284,7 +1284,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, without null and default is 1st member type and typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ ##T_START \"int\" ##T_END, \"string\" ], \"default\" : { \"int\" : 42 } } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"string\" ], \"default\" : 42 } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"string\" ], \"default\" : 42 } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1293,7 +1293,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, without null and optional
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", ##T_START \"int\" ##T_END ], \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"string\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"string\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1302,7 +1302,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, without null and optional, default is 1st member and not typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", ##T_START \"int\" ##T_END ], \"optional\" : true, \"default\" : { \"string\" : \"abc\" } } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", \"int\", \"null\" ], \"default\" : \"abc\" } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", \"int\", \"null\" ], \"default\" : \"abc\" } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1311,7 +1311,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, without null and optional, default is 1st member and not typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", ##T_START \"int\" ##T_END ], \"optional\" : true, \"default\" : { \"string\" : \"abc\" } } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"string\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"string\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1320,7 +1320,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, without null and optional, default is 1st member and typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ ##T_START \"int\" ##T_END, \"string\" ], \"optional\" : true, \"default\" : { \"int\" : 42 } } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1329,7 +1329,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, without null and optional, default is 2nd member and not typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ ##T_START \"int\" ##T_END, \"string\" ], \"optional\" : true, \"default\" : { \"string\" : \"abc\" } } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\", \"string\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1338,7 +1338,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, without null and optional, default is 2nd member and typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"string\", ##T_START \"int\" ##T_END ], \"optional\" : true, \"default\" : { \"int\" : 42 } } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"string\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"string\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1347,7 +1347,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, with null 1st member
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", ##T_START \"int\" ##T_END ] } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ] } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ] } ] }",
               null,
               null,
               null
@@ -1356,7 +1356,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, with null 1st member, default is 1st member and null
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", ##T_START \"int\" ##T_END ], \"default\" : null } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
               null,
               null,
               null
@@ -1365,7 +1365,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref with null 1st member, and optional
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", ##T_START \"int\" ##T_END ], \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1374,7 +1374,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref with null 1st member, and optional, default is 1st member and null
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", ##T_START \"int\" ##T_END ], \"optional\" : true, \"default\" : null } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1383,7 +1383,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref with null 1st member, and optional, default is last member and typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", ##T_START \"int\" ##T_END ], \"optional\" : true, \"default\" : { \"int\" : 42 } } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1392,7 +1392,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, with null last member
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ ##T_START \"int\" ##T_END, \"null\" ] } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\" ] } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\" ] } ] }",
               null,
               null,
               null
@@ -1401,7 +1401,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, with null last member, default is 1st member and typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ ##T_START \"int\" ##T_END, \"null\" ], \"default\" : { \"int\" : 42 } } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\" ], \"default\" : 42 } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\" ], \"default\" : 42 } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1410,7 +1410,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, with null last member, and optional
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ ##T_START \"int\" ##T_END, \"null\" ], \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1419,7 +1419,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, with null last member, and optional, default is 1st member and typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ ##T_START \"int\" ##T_END, \"null\" ], \"optional\" : true, \"default\" : { \"int\" : 42 } } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\" ], \"default\" : 42 } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"int\", \"null\" ], \"default\" : 42 } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1428,7 +1428,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, with null last member, and optional, default is 1st member and typeref-ed
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ ##T_START \"int\" ##T_END, \"null\" ], \"optional\" : true, \"default\" : { \"int\" : 42 } } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1437,7 +1437,7 @@ public Object[][] toAvroSchemaData()
               // record field with union with typeref, with null last member, and optional, default is last member and null
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ ##T_START \"int\" ##T_END, \"null\" ], \"optional\" : true, \"default\" : null } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1446,7 +1446,7 @@ public Object[][] toAvroSchemaData()
               // array of union with no default
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : ##T_START [ \"int\", \"string\" ] ##T_END } } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } } ] }",
               null,
               null,
               null
@@ -1455,7 +1455,7 @@ public Object[][] toAvroSchemaData()
               // array of union with default, default value uses only 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } ##T_END, \"default\" : [ { \"int\" : 42 }, { \"int\" : 13 } ] } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] }, \"default\" : [ 42, 13 ] } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] }, \"default\" : [ 42, 13 ] } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1464,7 +1464,7 @@ public Object[][] toAvroSchemaData()
               // array of union with default, default value uses only 1st null member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : ##T_START [ \"null\", \"string\" ] ##T_END }, \"default\" : [ null, null ] } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : [ \"null\", \"string\" ] }, \"default\" : [ null, null ] } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : [ \"null\", \"string\" ] }, \"default\" : [ null, null ] } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1473,7 +1473,7 @@ public Object[][] toAvroSchemaData()
               // optional array of union with no default
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : ##T_START [ \"int\", \"string\" ] ##T_END }, \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1482,7 +1482,7 @@ public Object[][] toAvroSchemaData()
               // optional array of union with default, default value uses only 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } ##T_END, \"optional\" : true, \"default\" : [ { \"int\" : 42 }, { \"int\" : 13 } ] } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] }, \"null\" ], \"default\" : [ 42, 13 ] } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] }, \"null\" ], \"default\" : [ 42, 13 ] } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1491,7 +1491,7 @@ public Object[][] toAvroSchemaData()
               // optional array of union with default, default value uses only 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } ##T_END, \"optional\" : true, \"default\" : [ { \"int\" : 42 }, { \"int\" : 13 } ] } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1500,7 +1500,7 @@ public Object[][] toAvroSchemaData()
               // optional array of union with default, default value uses 2nd member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"array\", \"items\" : ##T_START [ \"int\", \"string\" ] ##T_END }, \"optional\" : true, \"default\" : [ { \"int\" : 42 }, { \"string\" : \"abc\" } ] } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1509,7 +1509,7 @@ public Object[][] toAvroSchemaData()
               // map of union with no default
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : ##T_START [ \"int\", \"string\" ] ##T_END } } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } } ] }",
               null,
               null,
               null
@@ -1518,7 +1518,7 @@ public Object[][] toAvroSchemaData()
               // map of union with default, default value uses only 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } ##T_END, \"default\" : { \"m1\" : { \"int\" : 42 } } } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] }, \"default\" : { \"m1\" : 42 } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] }, \"default\" : { \"m1\" : 42 } } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1527,7 +1527,7 @@ public Object[][] toAvroSchemaData()
               // map of union with default, default value uses only 1st null member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : ##T_START [ \"null\", \"string\" ] ##T_END }, \"default\" : { \"m1\" : null } } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : [ \"null\", \"string\" ] }, \"default\" : { \"m1\" : null } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : [ \"null\", \"string\" ] }, \"default\" : { \"m1\" : null } } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1536,7 +1536,7 @@ public Object[][] toAvroSchemaData()
               // optional map of union with no default
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : ##T_START [ \"int\", \"string\" ] ##T_END }, \"optional\" : true } ] }",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1545,7 +1545,7 @@ public Object[][] toAvroSchemaData()
               // optional map of union with default, default value uses only 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } ##T_END, \"optional\" : true, \"default\" : { \"m1\" : { \"int\" : 42 } } } ] }",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] }, \"null\" ], \"default\" : { \"m1\" : 42 } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] }, \"null\" ], \"default\" : { \"m1\" : 42 } } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1554,7 +1554,7 @@ public Object[][] toAvroSchemaData()
               // optional map of union with default, default value uses only 1st member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : ##T_START { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } ##T_END, \"optional\" : true, \"default\" : { \"m1\" : { \"int\" : 42 } } } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1563,7 +1563,7 @@ public Object[][] toAvroSchemaData()
               // optional map of union with default, default value uses 2nd member type
               "{ \"type\" : \"record\", \"name\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"map\", \"values\" : ##T_START [ \"int\", \"string\" ] ##T_END }, \"optional\" : true, \"default\" : { \"m1\" : { \"string\" : \"abc\" } } } ] }",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"bar\", \"type\" : [ \"null\", { \"type\" : \"map\", \"values\" : [ \"int\", \"string\" ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               null
@@ -1591,7 +1591,7 @@ public Object[][] toAvroSchemaData()
                   "  ] " +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\",  \"fields\" : [ { \"name\" : \"f1\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"bar\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : \"int\" } ] } }, \"default\" : [  ] } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\",  \"fields\" : [ { \"name\" : \"f1\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"bar\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : \"int\" } ] } }, \"default\" : [  ] } ] }",
               null,
               null,
               null
@@ -1618,7 +1618,7 @@ public Object[][] toAvroSchemaData()
                   "  ] " +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : \"int\" }, { \"name\" : \"f1\", \"type\" : \"double\" } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : \"int\" }, { \"name\" : \"f1\", \"type\" : \"double\" } ] }",
               null,
               null,
               null
@@ -1649,7 +1649,7 @@ public Object[][] toAvroSchemaData()
                   "  ] " +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : [ \"null\", \"int\" ], \"default\" : null }, { \"name\" : \"f1\", \"type\" : { \"type\" : \"record\", \"name\" : \"f1\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] } }, { \"name\" : \"f2\", \"type\" : { \"type\" : \"record\", \"name\" : \"f2\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : [ \"null\", \"int\" ], \"default\" : null }, { \"name\" : \"f1\", \"type\" : { \"type\" : \"record\", \"name\" : \"f1\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] } }, { \"name\" : \"f2\", \"type\" : { \"type\" : \"record\", \"name\" : \"f2\", \"fields\" : [ { \"name\" : \"b1\", \"type\" : [ \"null\", \"int\" ], \"default\" : null } ] } } ] }",
               null,
               null,
               null
@@ -1681,7 +1681,7 @@ public Object[][] toAvroSchemaData()
                   "  ]" +
                   "}",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"Bar\", \"li.data.translated.from\" : \"Bar\", \"fields\" : [ { \"name\" : \"barbara\", \"type\" : { \"type\" : \"record\", \"name\" : \"Foo\", \"fields\" : [ { \"name\" : \"frank\", \"type\" : [ \"null\", \"string\" ], \"default\" : null } ] }, \"default\" : { \"frank\" : null } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"Bar\", \"schema.translated.from.src\" : \"Bar\", \"fields\" : [ { \"name\" : \"barbara\", \"type\" : { \"type\" : \"record\", \"name\" : \"Foo\", \"fields\" : [ { \"name\" : \"frank\", \"type\" : [ \"null\", \"string\" ], \"default\" : null } ] }, \"default\" : { \"frank\" : null } } ] }",
               null,
               null,
               null
@@ -1712,7 +1712,7 @@ public Object[][] toAvroSchemaData()
                   "  ]\n" +
                   "}\n",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"foo1\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"bar\", \"fields\" : [ { \"name\" : \"bar1\", \"type\" : [ \"string\", \"null\" ], \"default\" : \"abc\" } ] }, \"null\" ], \"default\" : { \"bar1\" : \"xyz\" } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"foo1\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"bar\", \"fields\" : [ { \"name\" : \"bar1\", \"type\" : [ \"string\", \"null\" ], \"default\" : \"abc\" } ] }, \"null\" ], \"default\" : { \"bar1\" : \"xyz\" } } ] }",
               emptyFooSchema,
               "{}",
               "{\"foo1\": {\"bar1\": \"xyz\"}}"
@@ -1733,7 +1733,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] }",
               null,
               null,
               null
@@ -1755,7 +1755,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"null\", \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"null\", \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] }",
               null,
               null,
               null
@@ -1777,7 +1777,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               "{\"result\": null}"
@@ -1800,7 +1800,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"null\", \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"null\", \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               "{\"result\": null}"
@@ -1822,7 +1822,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"string\", \"null\" ], \"doc\" : \"Success message\", \"default\" : \"Union with aliases.\" }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] }, \"default\" : { \"fieldDiscriminator\" : \"success\", \"success\" : \"Union with aliases.\", \"failure\" : null } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"string\", \"null\" ], \"doc\" : \"Success message\", \"default\" : \"Union with aliases.\" }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] }, \"default\" : { \"fieldDiscriminator\" : \"success\", \"success\" : \"Union with aliases.\", \"failure\" : null } } ] }",
               emptyFooSchema,
               emptyFooValue,
               "{\"result\": {\"success\": \"Union with aliases.\", \"failure\": null, \"fieldDiscriminator\": ##Q_STARTsuccess##Q_END}}"
@@ -1845,7 +1845,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"string\", \"null\" ], \"doc\" : \"Success message\", \"default\" : \"Union with aliases.\" }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] }, \"null\" ], \"default\" : { \"fieldDiscriminator\" : \"success\", \"success\" : \"Union with aliases.\", \"failure\" : null } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"string\", \"null\" ], \"doc\" : \"Success message\", \"default\" : \"Union with aliases.\" }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] }, \"null\" ], \"default\" : { \"fieldDiscriminator\" : \"success\", \"success\" : \"Union with aliases.\", \"failure\" : null } } ] }",
               emptyFooSchema,
               emptyFooValue,
               "{\"result\": {\"success\": \"Union with aliases.\", \"failure\": null, \"fieldDiscriminator\": ##Q_STARTsuccess##Q_END}}"
@@ -1868,7 +1868,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               "{\"result\": null}"
@@ -1892,7 +1892,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               translateDefault,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"null\", \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] }, \"null\" ], \"default\" : { \"fieldDiscriminator\" : \"null\", \"success\" : null, \"failure\" : null } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"null\", \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] }, \"null\" ], \"default\" : { \"fieldDiscriminator\" : \"null\", \"success\" : null, \"failure\" : null } } ] }",
               emptyFooSchema,
               emptyFooValue,
               "{\"result\": {\"success\": null, \"failure\": null, \"fieldDiscriminator\": ##Q_STARTnull##Q_END}}"
@@ -1916,7 +1916,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               translateToNull,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"null\", \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"null\", \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } ], \"default\" : null } ] }",
               emptyFooSchema,
               emptyFooValue,
               "{\"result\": null}"
@@ -1957,7 +1957,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"record\", \"name\" : \"Bar\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"BarResult\", \"fields\" : [ { \"name\" : \"resultUrn\", \"type\" : [ \"null\", \"string\" ], \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"BarResultDiscriminator\", \"symbols\" : [ \"resultUrn\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] } }, { \"name\" : \"baz\", \"type\" : { \"type\" : \"record\", \"name\" : \"Baz\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"BazResult\", \"fields\" : [ { \"name\" : \"resultUrn\", \"type\" : [ \"null\", \"string\" ], \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"BazResultDiscriminator\", \"symbols\" : [ \"resultUrn\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"bar\", \"type\" : { \"type\" : \"record\", \"name\" : \"Bar\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"BarResult\", \"fields\" : [ { \"name\" : \"resultUrn\", \"type\" : [ \"null\", \"string\" ], \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"BarResultDiscriminator\", \"symbols\" : [ \"resultUrn\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] } }, { \"name\" : \"baz\", \"type\" : { \"type\" : \"record\", \"name\" : \"Baz\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"BazResult\", \"fields\" : [ { \"name\" : \"resultUrn\", \"type\" : [ \"null\", \"string\" ], \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"BazResultDiscriminator\", \"symbols\" : [ \"resultUrn\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] } } ] }",
               null,
               null,
               null
@@ -1992,7 +1992,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"message\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"MessageRecord\", \"fields\" : [ { \"name\" : \"message\", \"type\" : { \"type\" : \"record\", \"name\" : \"MessageRecordMessage\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"MessageRecordMessageDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] } ], \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"message\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"result\", \"type\" : { \"type\" : \"record\", \"name\" : \"fooResult\", \"fields\" : [ { \"name\" : \"message\", \"type\" : [ \"null\", { \"type\" : \"record\", \"name\" : \"MessageRecord\", \"fields\" : [ { \"name\" : \"message\", \"type\" : { \"type\" : \"record\", \"name\" : \"MessageRecordMessage\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"MessageRecordMessageDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] } ], \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultDiscriminator\", \"symbols\" : [ \"message\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ] }",
               null,
               null,
               null
@@ -2016,7 +2016,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } ] }",
               null,
               null,
               null
@@ -2041,7 +2041,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } ] }",
               null,
               null,
               null
@@ -2066,7 +2066,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ], \"default\" : null } ] }",
               null,
               null,
               null
@@ -2092,7 +2092,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ], \"default\" : null } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : [ \"null\", { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } ], \"default\" : null } ] }",
               null,
               null,
               null
@@ -2123,7 +2123,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } } } ] }",
               null,
               null,
               null
@@ -2154,7 +2154,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } } } ] }",
               null,
               null,
               null
@@ -2185,7 +2185,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } } } ] }",
               null,
               null,
               null
@@ -2216,7 +2216,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"array\", \"items\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } } } ] }",
               null,
               null,
               null
@@ -2240,7 +2240,7 @@ public Object[][] toAvroSchemaData()
                   "]" +
                   "}",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"foo\", \"li.data.translated.from\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"foo\", \"schema.translated.from.src\" : \"foo\", \"fields\" : [ { \"name\" : \"results\", \"type\" : { \"type\" : \"map\", \"values\" : { \"type\" : \"record\", \"name\" : \"fooResults\", \"fields\" : [ { \"name\" : \"success\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Success message\", \"default\" : null }, { \"name\" : \"failure\", \"type\" : [ \"null\", \"string\" ], \"doc\" : \"Failure message\", \"default\" : null }, { \"name\" : \"fieldDiscriminator\", \"type\" : { \"type\" : \"enum\", \"name\" : \"fooResultsDiscriminator\", \"symbols\" : [ \"success\", \"failure\" ] }, \"doc\" : \"Contains the name of the field that has its value set.\" } ] } } } ] }",
               null,
               null,
               null
@@ -2258,7 +2258,7 @@ public Object[][] toAvroSchemaData()
               "   } ] " +
               " } ",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"Foo\", \"li.data.translated.from\" : \"Foo\", \"fields\" : [ { \"name\" : \"field1\", \"type\" : \"int\", \"a_customAnnotation\" : \"f1\", \"b_customAnnotation\" : \"f1\", \"c_customAnnotation\" : \"f1\" } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"Foo\", \"schema.translated.from.src\" : \"Foo\", \"fields\" : [ { \"name\" : \"field1\", \"type\" : \"int\", \"a_customAnnotation\" : \"f1\", \"b_customAnnotation\" : \"f1\", \"c_customAnnotation\" : \"f1\" } ] }",
               null,
               null,
               null
@@ -2280,7 +2280,7 @@ public Object[][] toAvroSchemaData()
               "   } ] " +
               " } ",
               allModes,
-              "{ \"type\" : \"record\", \"name\" : \"Foo\", \"li.data.translated.from\" : \"Foo\", \"fields\" : [ { \"name\" : \"field1\", \"type\" : \"int\", \"a_customAnnotation\" : \"f1\", \"b_customAnnotation\" : \"f1\", \"c_customAnnotation\" : { \"a_nested\" : \"a\", \"b_nested\" : \"a\", \"c_nested\" : \"a\" } } ] }",
+              "{ \"type\" : \"record\", \"name\" : \"Foo\", \"schema.translated.from.src\" : \"Foo\", \"fields\" : [ { \"name\" : \"field1\", \"type\" : \"int\", \"a_customAnnotation\" : \"f1\", \"b_customAnnotation\" : \"f1\", \"c_customAnnotation\" : { \"a_nested\" : \"a\", \"b_nested\" : \"a\", \"c_nested\" : \"a\" } } ] }",
               null,
               null,
               null