diff --git a/src/Microsoft.OData.Core/ODataMetadataOutputContext.cs b/src/Microsoft.OData.Core/ODataMetadataOutputContext.cs
index 180b8cdbd3..ea9c1b91b1 100644
--- a/src/Microsoft.OData.Core/ODataMetadataOutputContext.cs
+++ b/src/Microsoft.OData.Core/ODataMetadataOutputContext.cs
@@ -103,7 +103,7 @@ internal override void WriteMetadataDocument()
             this.AssertSynchronous();
 
             IEnumerable<EdmError> errors;
-            if (!EdmxWriter.TryWriteEdmx(this.Model, this.xmlWriter, EdmxTarget.OData, out errors))
+            if (!EdmxWriter.TryWriteEdmx(this.Model, this.xmlWriter, CsdlTarget.OData, out errors))
             {
                 Debug.Assert(errors != null, "errors != null");
 
diff --git a/src/Microsoft.OData.Edm/Build.Net35/Microsoft.OData.Edm.NetFX35.csproj b/src/Microsoft.OData.Edm/Build.Net35/Microsoft.OData.Edm.NetFX35.csproj
index 0e22709c85..e59dc725d3 100644
--- a/src/Microsoft.OData.Edm/Build.Net35/Microsoft.OData.Edm.NetFX35.csproj
+++ b/src/Microsoft.OData.Edm/Build.Net35/Microsoft.OData.Edm.NetFX35.csproj
@@ -55,9 +55,6 @@
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\EdmxReaderSettings.cs">
       <Link>Microsoft\OData\Edm\Csdl\EdmxReaderSettings.cs</Link>
     </Compile>
-    <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\EdmxTarget.cs">
-      <Link>Microsoft\OData\Edm\Csdl\EdmxTarget.cs</Link>
-    </Compile>
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\Csdl\EdmValueParser.cs">
       <Link>Microsoft\OData\Edm\Csdl\EdmValueParser.cs</Link>
     </Compile>
@@ -683,6 +680,9 @@
     <Compile Include="$(EdmLibCrossTargettingSourcePath)\..\PlatformHelper.cs">
       <Link>Microsoft\OData\Edm\PlatformHelper.cs</Link>
     </Compile>
+    <Compile Include="..\Csdl\CsdlTarget.cs">
+      <Link>Microsoft\OData\Edm\Csdl\CsdlTarget.cs</Link>
+    </Compile>
     <Compile Include="..\Csdl\SchemaReader.cs">
       <Link>Microsoft\OData\Edm\Csdl\SchemaReader.cs</Link>
     </Compile>
diff --git a/src/Microsoft.OData.Edm/Csdl/EdmxTarget.cs b/src/Microsoft.OData.Edm/Csdl/CsdlTarget.cs
similarity index 79%
rename from src/Microsoft.OData.Edm/Csdl/EdmxTarget.cs
rename to src/Microsoft.OData.Edm/Csdl/CsdlTarget.cs
index 9819f6d61a..e424b54909 100644
--- a/src/Microsoft.OData.Edm/Csdl/EdmxTarget.cs
+++ b/src/Microsoft.OData.Edm/Csdl/CsdlTarget.cs
@@ -1,5 +1,5 @@
 //---------------------------------------------------------------------
-// <copyright file="EdmxTarget.cs" company="Microsoft">
+// <copyright file="CsdlTarget.cs" company="Microsoft">
 //      Copyright (C) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
 // </copyright>
 //---------------------------------------------------------------------
@@ -7,9 +7,9 @@
 namespace Microsoft.OData.Edm.Csdl
 {
     /// <summary>
-    /// Specifies what target of an EDMX file.
+    /// Specifies what target of a CSDL doc.
     /// </summary>
-    public enum EdmxTarget
+    public enum CsdlTarget
     {
         /// <summary>
         /// The target is Entity Framework.
diff --git a/src/Microsoft.OData.Edm/Csdl/EdmxWriter.cs b/src/Microsoft.OData.Edm/Csdl/EdmxWriter.cs
index b8e11c94e1..9db46069c4 100644
--- a/src/Microsoft.OData.Edm/Csdl/EdmxWriter.cs
+++ b/src/Microsoft.OData.Edm/Csdl/EdmxWriter.cs
@@ -24,9 +24,9 @@ public class EdmxWriter
         private readonly XmlWriter writer;
         private readonly Version edmxVersion;
         private readonly string edmxNamespace;
-        private readonly EdmxTarget target;
+        private readonly CsdlTarget target;
 
-        private EdmxWriter(IEdmModel model, IEnumerable<EdmSchema> schemas, XmlWriter writer, Version edmxVersion, EdmxTarget target)
+        private EdmxWriter(IEdmModel model, IEnumerable<EdmSchema> schemas, XmlWriter writer, Version edmxVersion, CsdlTarget target)
         {
             this.model = model;
             this.schemas = schemas;
@@ -46,7 +46,7 @@ private EdmxWriter(IEdmModel model, IEnumerable<EdmSchema> schemas, XmlWriter wr
         /// <param name="target">Target implementation of the EDMX being generated.</param>
         /// <param name="errors">Errors that prevented successful serialization, or no errors if serialization was successful. </param>
         /// <returns>A value indicating whether serialization was successful.</returns>
-        public static bool TryWriteEdmx(IEdmModel model, XmlWriter writer, EdmxTarget target, out IEnumerable<EdmError> errors)
+        public static bool TryWriteEdmx(IEdmModel model, XmlWriter writer, CsdlTarget target, out IEnumerable<EdmError> errors)
         {
             EdmUtil.CheckArgumentNull(model, "model");
             EdmUtil.CheckArgumentNull(writer, "writer");
@@ -86,14 +86,14 @@ private void WriteEdmx()
         {
             switch (this.target)
             {
-                case EdmxTarget.EntityFramework:
+                case CsdlTarget.EntityFramework:
                     this.WriteEFEdmx();
                     break;
-                case EdmxTarget.OData:
+                case CsdlTarget.OData:
                     this.WriteODataEdmx();
                     break;
                 default:
-                    throw new InvalidOperationException(Edm.Strings.UnknownEnumVal_EdmxTarget(this.target.ToString()));
+                    throw new InvalidOperationException(Edm.Strings.UnknownEnumVal_CsdlTarget(this.target.ToString()));
             }
         }
 
diff --git a/src/Microsoft.OData.Edm/Microsoft.OData.Edm.cs b/src/Microsoft.OData.Edm/Microsoft.OData.Edm.cs
index 8d31fcb496..0ea8ac3046 100644
--- a/src/Microsoft.OData.Edm/Microsoft.OData.Edm.cs
+++ b/src/Microsoft.OData.Edm/Microsoft.OData.Edm.cs
@@ -301,7 +301,7 @@ internal sealed class EntityRes {
         internal const string UnknownEnumVal_TypeKind = "UnknownEnumVal_TypeKind";
         internal const string UnknownEnumVal_PrimitiveKind = "UnknownEnumVal_PrimitiveKind";
         internal const string UnknownEnumVal_ContainerElementKind = "UnknownEnumVal_ContainerElementKind";
-        internal const string UnknownEnumVal_EdmxTarget = "UnknownEnumVal_EdmxTarget";
+        internal const string UnknownEnumVal_CsdlTarget = "UnknownEnumVal_CsdlTarget";
         internal const string UnknownEnumVal_PropertyKind = "UnknownEnumVal_PropertyKind";
         internal const string UnknownEnumVal_ExpressionKind = "UnknownEnumVal_ExpressionKind";
         internal const string Bad_AmbiguousElementBinding = "Bad_AmbiguousElementBinding";
diff --git a/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj b/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj
index 35c69c2be2..1efa5047f2 100644
--- a/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj
+++ b/src/Microsoft.OData.Edm/Microsoft.OData.Edm.csproj
@@ -48,7 +48,7 @@
     <Compile Include="Csdl\CsdlLocation.cs" />
     <Compile Include="Csdl\EdmParseException.cs" />
     <Compile Include="Csdl\EdmxReaderSettings.cs" />
-    <Compile Include="Csdl\EdmxTarget.cs" />
+    <Compile Include="Csdl\CsdlTarget.cs" />
     <Compile Include="Csdl\EdmValueParser.cs" />
     <Compile Include="Csdl\EdmValueWriter.cs" />
     <Compile Include="Csdl\Parsing\Ast\CsdlNavigationPropertyPathExpression.cs" />
diff --git a/src/Microsoft.OData.Edm/Parameterized.Microsoft.OData.Edm.cs b/src/Microsoft.OData.Edm/Parameterized.Microsoft.OData.Edm.cs
index 8625296790..4477e48378 100644
--- a/src/Microsoft.OData.Edm/Parameterized.Microsoft.OData.Edm.cs
+++ b/src/Microsoft.OData.Edm/Parameterized.Microsoft.OData.Edm.cs
@@ -1752,10 +1752,10 @@ internal static class Strings {
         }
 
         /// <summary>
-        /// A string like "Invalid edmx target: '{0}'"
+        /// A string like "Invalid CSDL target: '{0}'"
         /// </summary>
-        internal static string UnknownEnumVal_EdmxTarget(object p0) {
-            return Microsoft.OData.Edm.EntityRes.GetString(Microsoft.OData.Edm.EntityRes.UnknownEnumVal_EdmxTarget, p0);
+        internal static string UnknownEnumVal_CsdlTarget(object p0) {
+            return Microsoft.OData.Edm.EntityRes.GetString(Microsoft.OData.Edm.EntityRes.UnknownEnumVal_CsdlTarget, p0);
         }
 
         /// <summary>
diff --git a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/HardCodedTestModel.cs b/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/HardCodedTestModel.cs
index f504dab8e3..8c9770fb32 100644
--- a/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/HardCodedTestModel.cs
+++ b/test/FunctionalTests/Microsoft.OData.Core.Tests/UriParser/HardCodedTestModel.cs
@@ -735,7 +735,7 @@ internal static IEdmModel GetEdmModel()
                 IEnumerable<EdmError> errors;
                 using (var writer = document.CreateWriter())
                 {
-                    EdmxWriter.TryWriteEdmx(model, writer, EdmxTarget.OData, out errors).Should().BeTrue();
+                    EdmxWriter.TryWriteEdmx(model, writer, CsdlTarget.OData, out errors).Should().BeTrue();
                 }
 
                 string doc = document.ToString();
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmxWriterTests.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmxWriterTests.cs
index 3c38c1e2ad..81ae3e2c84 100644
--- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmxWriterTests.cs
+++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/Csdl/EdmxWriterTests.cs
@@ -42,7 +42,7 @@ public void VerifyAnnotationComputedConcurrency()
             model.SetOptimisticConcurrencyAnnotation(set1, new IEdmStructuralProperty[] { entityId, timeVer });
             entityContainer.AddElement(set1);
 
-            string csdlStr = GetEdmx(model, EdmxTarget.OData);
+            string csdlStr = GetEdmx(model, CsdlTarget.OData);
             Assert.Equal(@"<?xml version=""1.0"" encoding=""utf-16""?><edmx:Edmx Version=""4.0"" xmlns:edmx=""http://docs.oasis-open.org/odata/ns/edmx""><edmx:DataServices><Schema Namespace=""NS1"" xmlns=""http://docs.oasis-open.org/odata/ns/edm""><EntityType Name=""Product""><Key><PropertyRef Name=""Id"" /></Key><Property Name=""Id"" Type=""Edm.Int32"" Nullable=""false""><Annotation Term=""Org.OData.Core.V1.Computed"" Bool=""true"" /></Property><Property Name=""Name"" Type=""Edm.String"" Nullable=""false"" /><Property Name=""UpdatedTime"" Type=""Edm.Date"" Nullable=""false""><Annotation Term=""Org.OData.Core.V1.Computed"" Bool=""true"" /></Property></EntityType><EntityContainer Name=""Container""><EntitySet Name=""Products"" EntityType=""NS1.Product""><Annotation Term=""Org.OData.Core.V1.OptimisticConcurrency""><Collection><PropertyPath>Id</PropertyPath><PropertyPath>UpdatedTime</PropertyPath></Collection></Annotation></EntitySet></EntityContainer></Schema></edmx:DataServices></edmx:Edmx>", csdlStr);
         }
 
@@ -104,7 +104,7 @@ public void WriteNavigationPropertyInComplexType()
             entityContainer.AddElement(cities);
             entityContainer.AddElement(countries);
 
-            string actual = GetEdmx(model, EdmxTarget.OData);
+            string actual = GetEdmx(model, CsdlTarget.OData);
 
             string expected =
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?><edmx:Edmx Version=\"4.0\" xmlns:edmx=\"http://docs.oasis-open.org/odata/ns/edmx\">" +
@@ -185,7 +185,7 @@ public void WriteCollectionOfNavigationOnComplex()
             entityContainer.AddElement(entites);
             entityContainer.AddElement(navEntities);
 
-            string actual = GetEdmx(model, EdmxTarget.OData);
+            string actual = GetEdmx(model, CsdlTarget.OData);
 
             string expected = "<?xml version=\"1.0\" encoding=\"utf-16\"?><edmx:Edmx Version=\"4.0\" xmlns:edmx=\"http://docs.oasis-open.org/odata/ns/edmx\">" +
                               "<edmx:DataServices><Schema Namespace=\"DefaultNs\" xmlns=\"http://docs.oasis-open.org/odata/ns/edm\">" +
@@ -231,7 +231,7 @@ public static void SetComputedAnnotation(EdmModel model, IEdmProperty target)
 
         #endregion
 
-        private string GetEdmx(IEdmModel model, EdmxTarget target)
+        private string GetEdmx(IEdmModel model, CsdlTarget target)
         {
             string edmx = string.Empty;
 
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.cs
index 10e5cab9b9..929ba47374 100644
--- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.cs
+++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisActionsFunctionsRelationshipChangesAcceptanceTests.cs
@@ -406,7 +406,7 @@ public void VerifyRepresentativeModelWrittenOutCorrectly()
             using (var writer = XmlWriter.Create(builder))
             {
                 IEnumerable<EdmError> errors;
-                EdmxWriter.TryWriteEdmx(this.TestModel.RepresentativeModel, writer, EdmxTarget.OData, out errors).Should().BeTrue();
+                EdmxWriter.TryWriteEdmx(this.TestModel.RepresentativeModel, writer, CsdlTarget.OData, out errors).Should().BeTrue();
                 errors.Should().BeEmpty();
                 writer.Flush();
             }
diff --git a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.cs b/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.cs
index 274ead1e5f..138979b110 100644
--- a/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.cs
+++ b/test/FunctionalTests/Microsoft.OData.Edm.Tests/ScenarioTests/OasisRelationshipChangesAcceptanceTests.cs
@@ -190,7 +190,7 @@ public void WriterShouldContinueToWork()
             using (var writer = XmlWriter.Create(builder))
             {
                 IEnumerable<EdmError> errors;
-                EdmxWriter.TryWriteEdmx(this.representativeModel, writer, EdmxTarget.OData, out errors).Should().BeTrue();
+                EdmxWriter.TryWriteEdmx(this.representativeModel, writer, CsdlTarget.OData, out errors).Should().BeTrue();
                 errors.Should().BeEmpty();
                 writer.Flush();
             }
diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmVersionTests.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmVersionTests.cs
index b8b5880bdb..aae2a85114 100644
--- a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmVersionTests.cs
+++ b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmVersionTests.cs
@@ -205,7 +205,7 @@ public void CheckEdmxVersionRoundtrip()
 
             using (XmlWriter xw = XmlWriter.Create(sw, settings))
             {
-                EdmxWriter.TryWriteEdmx(model, xw, EdmxTarget.OData, out errors);
+                EdmxWriter.TryWriteEdmx(model, xw, CsdlTarget.OData, out errors);
                 xw.Close();
 
                 parsed = EdmxReader.TryParse(XmlReader.Create(new StringReader(sw.ToString())), out model, out errors);
@@ -255,7 +255,7 @@ public void CheckEdmxVersionChange()
             using (XmlWriter xw = XmlWriter.Create(sw, settings))
             {
                 model.SetEdmxVersion(CsdlConstants.EdmxVersionLatest);
-                EdmxWriter.TryWriteEdmx(model, xw, EdmxTarget.OData, out errors);
+                EdmxWriter.TryWriteEdmx(model, xw, CsdlTarget.OData, out errors);
                 xw.Close();
 
                 parsed = EdmxReader.TryParse(XmlReader.Create(new StringReader(sw.ToString())), out model, out errors);
@@ -305,7 +305,7 @@ public void CheckEdmxVersionInference()
             using (XmlWriter xw = XmlWriter.Create(sw, settings))
             {
                 model.SetEdmxVersion(CsdlConstants.EdmxVersionLatest);
-                EdmxWriter.TryWriteEdmx(model, xw, EdmxTarget.OData, out errors);
+                EdmxWriter.TryWriteEdmx(model, xw, CsdlTarget.OData, out errors);
                 xw.Close();
 
                 parsed = EdmxReader.TryParse(XmlReader.Create(new StringReader(sw.ToString())), out model, out errors);
@@ -389,7 +389,7 @@ public void CheckEdmxUnsupportedVersion()
                 model.SetEdmxVersion(new Version(1, 123));
                 try
                 {
-                    EdmxWriter.TryWriteEdmx(model, xw, EdmxTarget.OData, out errors);
+                    EdmxWriter.TryWriteEdmx(model, xw, CsdlTarget.OData, out errors);
                 }
                 catch (Exception e)
                 {
diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmxRoundTripTests.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmxRoundTripTests.cs
index 0a40f390f7..258fc77b9e 100644
--- a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmxRoundTripTests.cs
+++ b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmxRoundTripTests.cs
@@ -94,7 +94,7 @@ public void EdmxRoundTripTwoRuntimeEdmx()
         [TestMethod]
         public void EdmxRoundTripTestsEmptyConceptualModelsEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyConceptualModelsEdmx(), EdmxTarget.EntityFramework);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyConceptualModelsEdmx(), CsdlTarget.EntityFramework);
         }
 
         [TestMethod]
@@ -102,26 +102,26 @@ public void EdmxRoundTripTestsEmptyConceptualModelsModel()
         {
             var model = new EdmModel();
             model.SetEdmxVersion(EdmConstants.EdmVersion4);
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyConceptualModelsEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyConceptualModelsEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleConceptualModelsEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), EdmxTarget.EntityFramework);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), CsdlTarget.EntityFramework);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleConceptualoMdelsModel()
         {
             var model = EdmxModelBuilder.SimpleEdmx();
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsEmptyDataServicesEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), EdmxTarget.OData);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), CsdlTarget.OData);
         }
 
         [TestMethod]
@@ -129,54 +129,54 @@ public void EdmxRoundTripTestsEmptyDataServicesModel()
         {
             var model = new EdmModel();
             model.SetEdmxVersion(EdmConstants.EdmVersion4);
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), EdmxTarget.OData, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), CsdlTarget.OData, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsEmptyDataServicesWithOtherAttributesEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), EdmxTarget.OData, this.GetEdmxParserResult(EdmxModelBuilder.EmptyDataServicesWithOtherAttributesEdmx()));
+            this.EdmxRoundTripCheck(EdmxModelBuilder.EmptyDataServicesEdmx(), CsdlTarget.OData, this.GetEdmxParserResult(EdmxModelBuilder.EmptyDataServicesWithOtherAttributesEdmx()));
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleDataServicesEdmx()
         {
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), EdmxTarget.OData);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), CsdlTarget.OData);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleDataServicesModel()
         {
             var model = EdmxModelBuilder.SimpleEdmx();
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), EdmxTarget.OData, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), CsdlTarget.OData, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsSimpleDataServicesWithVersionAttributesModelToConceptualModels()
         {
             var model = EdmxModelBuilder.SimpleEdmx();
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsConceptualModelsToDataServices()
         {
             var model = this.GetEdmxParserResult(EdmxModelBuilder.SimpleConceptualModelsEdmx());
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), EdmxTarget.OData, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleDataServicesEdmx(), CsdlTarget.OData, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsDataServicesToConceptualModels()
         {
             var model = this.GetEdmxParserResult(EdmxModelBuilder.SimpleDataServicesEdmx());
-            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.SimpleConceptualModelsEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         [TestMethod]
         public void EdmxRoundTripTestsUsingAliasEdmx()
         {
             var model = this.GetEdmxParserResult(EdmxModelBuilder.UsingAliasEdmx());
-            this.EdmxRoundTripCheck(EdmxModelBuilder.UsingAliasEdmx(), EdmxTarget.EntityFramework, model);
+            this.EdmxRoundTripCheck(EdmxModelBuilder.UsingAliasEdmx(), CsdlTarget.EntityFramework, model);
         }
 
         #region referenced model - Include, IncludeAnnotations
@@ -192,7 +192,7 @@ public void EdmxRoundTripTestsUsingAliasInReferencedEdmx()
             IEnumerable<EdmError> errors;
             bool valid = mainModel.Validate(out errors);
             Assert.IsTrue(valid);
-            string actualEdmx = GetEdmx(mainModel, EdmxTarget.OData);
+            string actualEdmx = GetEdmx(mainModel, CsdlTarget.OData);
 
             // after deserialization & serialization, the alias'ed 'CT.Customer' becomes qualified name 'NS1.Customer',
             // so make some adjustments for verification: 
@@ -233,7 +233,7 @@ public void EdmxRoundTripTests_EdmxReferences()
             newReferences.AddRange(references);
             newReferences.Add(newReference);
             mainModel.SetEdmReferences(newReferences);
-            string actualEdmx = GetEdmx(mainModel, EdmxTarget.OData);
+            string actualEdmx = GetEdmx(mainModel, CsdlTarget.OData);
 
             // add new Include to verify: Namespace=""adhoc_Namespace"" Alias=""adhoc_Alias""
             mainEdmx = mainEdmx.Replace("  <edmx:DataServices>",
@@ -252,14 +252,14 @@ public void EdmxRoundTripTests_EdmxReferences()
         }
         #endregion
 
-        private void EdmxRoundTripCheck(string edmx, EdmxTarget target)
+        private void EdmxRoundTripCheck(string edmx, CsdlTarget target)
         {
             IEdmModel model = this.GetEdmxParserResult(edmx);
 
             this.EdmxRoundTripCheck(edmx, target, model);
         }
 
-        private string GetEdmx(IEdmModel model, EdmxTarget target)
+        private string GetEdmx(IEdmModel model, CsdlTarget target)
         {
             string edmx = string.Empty;
 
@@ -292,7 +292,7 @@ private void EdmxCheckForErrors(string edmx, IEnumerable<ExpectedEdmError> expec
             ValidationVerificationHelper.Verify(expectedErrors, actualErrors);
         }
 
-        private void EdmxRoundTripCheck(string expectedEdmx, EdmxTarget target, IEdmModel model)
+        private void EdmxRoundTripCheck(string expectedEdmx, CsdlTarget target, IEdmModel model)
         {
             var errors = new EdmLibTestErrors();
             this.VerifySemanticValidation(model, Microsoft.Test.OData.Utils.Metadata.EdmVersion.V40, errors);
diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmxSerializingTests.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmxSerializingTests.cs
index db947208e3..9077671f3c 100644
--- a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmxSerializingTests.cs
+++ b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/EdmxSerializingTests.cs
@@ -59,7 +59,7 @@ public void SerializeSimpleSchemaAsEFEdmx()
   </edmx:Runtime>
 </edmx:Edmx>";
 
-            VerifyResult(inputText, expectedResult, EdmxTarget.EntityFramework);
+            VerifyResult(inputText, expectedResult, CsdlTarget.EntityFramework);
         }
 
         [TestMethod]
@@ -101,7 +101,7 @@ public void SerializeMultipleCsdlInEFEdmx()
   </edmx:Runtime>
 </edmx:Edmx>";
 
-            VerifyResult(new string[] { inputText1, inputText2 }, expectedResult, EdmxTarget.EntityFramework);
+            VerifyResult(new string[] { inputText1, inputText2 }, expectedResult, CsdlTarget.EntityFramework);
         }
 
         [TestMethod]
@@ -139,7 +139,7 @@ public void SerializeSimpleSchemaAsODataEdmx()
   </edmx:DataServices>
 </edmx:Edmx>";
 
-            VerifyResult(inputText, expectedResult, EdmxTarget.OData);
+            VerifyResult(inputText, expectedResult, CsdlTarget.OData);
         }
 
         [TestMethod]
@@ -179,7 +179,7 @@ public void SerializeMultipleCsdlInODataEdmx()
   </edmx:DataServices>
 </edmx:Edmx>";
 
-            VerifyResult(new string[] { inputText1, inputText2 }, expectedResult, EdmxTarget.OData);
+            VerifyResult(new string[] { inputText1, inputText2 }, expectedResult, CsdlTarget.OData);
         }
 
         [TestMethod]
@@ -240,7 +240,7 @@ public void TestEntityContainerSchemaNamespace()
   </edmx:Runtime>
 </edmx:Edmx>";
 
-            VerifyResult(new string[] { inputText1, inputText2 }, expectedResult, EdmxTarget.EntityFramework,
+            VerifyResult(new string[] { inputText1, inputText2 }, expectedResult, CsdlTarget.EntityFramework,
                 model =>
                 {
                     Assert.AreEqual("Mumble", model.EntityContainer.Namespace, "GetEntityContainerSchemaNamespace check");
@@ -272,7 +272,7 @@ public void TestEntityContainerPreservingNamespaceOfEmptySchema()
   </edmx:Runtime>
 </edmx:Edmx>";
 
-            VerifyResult(new string[] { inputText1 }, expectedResult, EdmxTarget.EntityFramework,
+            VerifyResult(new string[] { inputText1 }, expectedResult, CsdlTarget.EntityFramework,
                 model =>
                 {
                     Assert.AreEqual("Grumble", model.EntityContainer.Namespace, "GetEntityContainerSchemaNamespace check");
@@ -306,7 +306,7 @@ public void TestNullArgChecks()
 
             try
             {
-                EdmxWriter.TryWriteEdmx(null, XmlWriter.Create(new StringWriter()), EdmxTarget.EntityFramework, out errors);
+                EdmxWriter.TryWriteEdmx(null, XmlWriter.Create(new StringWriter()), CsdlTarget.EntityFramework, out errors);
             }
             catch (Exception e)
             {
@@ -314,7 +314,7 @@ public void TestNullArgChecks()
             }
             try
             {
-                EdmxWriter.TryWriteEdmx(model, null, EdmxTarget.EntityFramework, out errors);
+                EdmxWriter.TryWriteEdmx(model, null, CsdlTarget.EntityFramework, out errors);
             }
             catch (Exception e)
             {
@@ -322,7 +322,7 @@ public void TestNullArgChecks()
             }
         }
 
-        void VerifyResult(string inputText, string expectedResult, EdmxTarget target)
+        void VerifyResult(string inputText, string expectedResult, CsdlTarget target)
         {
             IEdmModel model;
             IEnumerable<EdmError> errors;
@@ -342,12 +342,12 @@ void VerifyResult(string inputText, string expectedResult, EdmxTarget target)
             Assert.AreEqual(expectedResult, outputText, "Expected Result = Output");
         }
 
-        void VerifyResult(string[] inputText, string expectedResult, EdmxTarget target)
+        void VerifyResult(string[] inputText, string expectedResult, CsdlTarget target)
         {
             VerifyResult(inputText, expectedResult, target, null);
         }
 
-        void VerifyResult(string[] inputText, string expectedResult, EdmxTarget target, Action<IEdmModel> visitModel)
+        void VerifyResult(string[] inputText, string expectedResult, CsdlTarget target, Action<IEdmModel> visitModel)
         {
             IEdmModel model;
             IEnumerable<EdmError> errors;
diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/ParallelTests.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/ParallelTests.cs
index 3f7a699bb2..d65851633f 100644
--- a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/ParallelTests.cs
+++ b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/ParallelTests.cs
@@ -123,7 +123,7 @@ public CsdlParModel()
                 using (var xw = XmlWriter.Create(tw))
                 {
                     IEnumerable<EdmError> errors;
-                    EdmxWriter.TryWriteEdmx(BaseModel, xw, EdmxTarget.OData, out errors);
+                    EdmxWriter.TryWriteEdmx(BaseModel, xw, CsdlTarget.OData, out errors);
                 }
             }
             catch (Exception)
@@ -283,7 +283,7 @@ public void FindVocabularyAnnotationInParallel()
                 var xw = XmlWriter.Create(ms, new XmlWriterSettings { Indent = true });
 
                 IEnumerable<EdmError> errors;
-                var res = EdmxWriter.TryWriteEdmx(edmModel, xw, EdmxTarget.OData, out errors);
+                var res = EdmxWriter.TryWriteEdmx(edmModel, xw, CsdlTarget.OData, out errors);
                 xw.Flush();
                 ms.Flush();
                 ms.Seek(0, SeekOrigin.Begin);
diff --git a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/VocabularyParsingTests.cs b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/VocabularyParsingTests.cs
index b367ab806d..90f1961595 100644
--- a/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/VocabularyParsingTests.cs
+++ b/test/FunctionalTests/Tests/DataEdmLib/FunctionalTests/VocabularyParsingTests.cs
@@ -2828,7 +2828,7 @@ public void TestEnumMemberReferencingExtraEnumType()
 
             using (var xw = XmlWriter.Create(stream, new XmlWriterSettings() { Indent = true }))
             {
-                Assert.IsTrue(EdmxWriter.TryWriteEdmx(edmModel, xw, EdmxTarget.OData, out errors));
+                Assert.IsTrue(EdmxWriter.TryWriteEdmx(edmModel, xw, CsdlTarget.OData, out errors));
             }
 
             stream.Seek(0, SeekOrigin.Begin);
diff --git a/test/FunctionalTests/Tests/DataOData/Tests/OData.Common.Tests/PublicApi/PublicApi.bsl b/test/FunctionalTests/Tests/DataOData/Tests/OData.Common.Tests/PublicApi/PublicApi.bsl
index ccc86fde4e..4a90f3283f 100644
--- a/test/FunctionalTests/Tests/DataOData/Tests/OData.Common.Tests/PublicApi/PublicApi.bsl
+++ b/test/FunctionalTests/Tests/DataOData/Tests/OData.Common.Tests/PublicApi/PublicApi.bsl
@@ -2534,16 +2534,16 @@ public sealed class Microsoft.OData.Edm.EdmNavigationPropertyInfo {
 	public Microsoft.OData.Edm.EdmNavigationPropertyInfo Clone ()
 }
 
+public enum Microsoft.OData.Edm.Csdl.CsdlTarget : int {
+	EntityFramework = 0
+	OData = 1
+}
+
 public enum Microsoft.OData.Edm.Csdl.EdmVocabularyAnnotationSerializationLocation : int {
 	Inline = 0
 	OutOfLine = 1
 }
 
-public enum Microsoft.OData.Edm.Csdl.EdmxTarget : int {
-	EntityFramework = 0
-	OData = 1
-}
-
 public sealed class Microsoft.OData.Edm.Csdl.CsdlConstants {
 	public static readonly System.Version EdmxVersion4 = 4.0
 	public static readonly System.Version EdmxVersionLatest = 4.0
@@ -2676,7 +2676,7 @@ public class Microsoft.OData.Edm.Csdl.EdmxReader {
 }
 
 public class Microsoft.OData.Edm.Csdl.EdmxWriter {
-	public static bool TryWriteEdmx (Microsoft.OData.Edm.IEdmModel model, System.Xml.XmlWriter writer, Microsoft.OData.Edm.Csdl.EdmxTarget target, out System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.Validation.EdmError]]& errors)
+	public static bool TryWriteEdmx (Microsoft.OData.Edm.IEdmModel model, System.Xml.XmlWriter writer, Microsoft.OData.Edm.Csdl.CsdlTarget target, out System.Collections.Generic.IEnumerable`1[[Microsoft.OData.Edm.Validation.EdmError]]& errors)
 }
 
 public sealed class Microsoft.OData.Edm.Csdl.EdmxReaderSettings {
diff --git a/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/MetadataReaderTestDescriptor.cs b/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/MetadataReaderTestDescriptor.cs
index d74f95d019..2763b468f1 100644
--- a/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/MetadataReaderTestDescriptor.cs
+++ b/test/FunctionalTests/Tests/DataOData/Tests/OData.Reader.Tests/MetadataReaderTestDescriptor.cs
@@ -257,7 +257,7 @@ private byte[] GetPayload(ReaderTestConfiguration testConfiguration)
                 {
                     IEnumerable<EdmError> errors;
 
-                    if (!EdmxWriter.TryWriteEdmx(this.PayloadEdmModel, xmlWriter, EdmxTarget.OData, out errors))
+                    if (!EdmxWriter.TryWriteEdmx(this.PayloadEdmModel, xmlWriter, CsdlTarget.OData, out errors))
                     {
                         var errorBuilder = new StringBuilder();