Index: tools/install/Installer.cs
==================================================================
--- tools/install/Installer.cs
+++ tools/install/Installer.cs
@@ -1824,19 +1824,10 @@
             #endregion
 
             ///////////////////////////////////////////////////////////////////
 
             #region Public Properties
-            private string configInvariantName;
-            public string ConfigInvariantName
-            {
-                get { return configInvariantName; }
-                set { configInvariantName = value; }
-            }
-
-            ///////////////////////////////////////////////////////////////////
-
             private string providerInvariantName;
             public string ProviderInvariantName
             {
                 get { return providerInvariantName; }
                 set { providerInvariantName = value; }
@@ -3403,10 +3394,19 @@
             }
             #endregion
 
             ///////////////////////////////////////////////////////////////////
 
+            #region Private Methods
+            private string GetInvariantName()
+            {
+                return IsEf6Supported() ? Ef6InvariantName : InvariantName;
+            }
+            #endregion
+
+            ///////////////////////////////////////////////////////////////////
+
             #region Public Methods
             public bool HasFlags(
                 InstallFlags hasFlags,
                 bool all
                 )
@@ -3502,18 +3502,18 @@
 
             ///////////////////////////////////////////////////////////////////
 
             public string GetConfigInvariantName()
             {
-                return InvariantName;
+                return GetInvariantName();
             }
 
             ///////////////////////////////////////////////////////////////////
 
             public string GetProviderInvariantName()
             {
-                return IsEf6Supported() ? Ef6InvariantName : InvariantName;
+                return GetInvariantName();
             }
 
             ///////////////////////////////////////////////////////////////////
 
             public string GetFactoryTypeName()
@@ -3735,10 +3735,14 @@
                     traceCallback(String.Format(NameAndValueFormat,
                         "GetDesignerAssemblyName", ForDisplay(
                         GetDesignerAssemblyName())), traceCategory);
 
                     ///////////////////////////////////////////////////////////
+
+                    traceCallback(String.Format(NameAndValueFormat,
+                        "GetInvariantName", ForDisplay(GetInvariantName())),
+                        traceCategory);
 
                     traceCallback(String.Format(NameAndValueFormat,
                         "GetConfigInvariantName", ForDisplay(
                         GetConfigInvariantName())), traceCategory);
 
@@ -6196,11 +6200,10 @@
 
         ///////////////////////////////////////////////////////////////////////
 
         #region Visual Studio Package Handling
         private static void InitializeVsPackage(
-            string configInvariantName,
             string providerInvariantName,
             string factoryTypeName,
             AssemblyName providerAssemblyName,
             AssemblyName designerAssemblyName,
             bool globalAssemblyCache,
@@ -6209,11 +6212,10 @@
         {
             if (package == null)
             {
                 package = new Package();
 
-                package.ConfigInvariantName = configInvariantName;
                 package.ProviderInvariantName = providerInvariantName;
                 package.FactoryTypeName = factoryTypeName;
                 package.ProviderAssemblyName = providerAssemblyName;
                 package.DesignerAssemblyName = designerAssemblyName;
                 package.GlobalAssemblyCache = globalAssemblyCache;
@@ -6860,11 +6862,10 @@
                     VsList vsList = null;
 
                     ///////////////////////////////////////////////////////////
 
                     InitializeVsPackage(
-                        configuration.GetConfigInvariantName(),
                         configuration.GetProviderInvariantName(),
                         configuration.GetFactoryTypeName(),
                         configuration.GetProviderAssemblyName(),
                         configuration.GetDesignerAssemblyName(),
                         configuration.HasFlags(
@@ -7050,12 +7051,13 @@
                         bool saved = false;
 
                         if (!ForEachFrameworkConfig(registry,
                                 frameworkList, ProcessDbProviderFactory,
                                 configuration.ConfigVersion,
-                                package.ConfigInvariantName, ProviderName,
-                                Description, package.FactoryTypeName,
+                                configuration.GetConfigInvariantName(),
+                                ProviderName, Description,
+                                package.FactoryTypeName,
                                 package.ProviderAssemblyName, directoryData,
                                 configuration.PerUser,
                                 NetFxIs32BitOnly || configuration.Wow64,
                                 configuration.ThrowOnMissing,
                                 configuration.WhatIf, configuration.Verbose,