diff --git a/build/Program.fs b/build/Program.fs
index 8941ddbd..b4f378d2 100644
--- a/build/Program.fs
+++ b/build/Program.fs
@@ -30,7 +30,7 @@ let main argv =
     let nuspec_dirs = [
         "lib.e_sqlite3"
         "lib.e_sqlcipher"
-        "lib.sqlite3mc"
+        "lib.e_sqlite3mc"
     ]
 
     for s in nuspec_dirs do
@@ -42,30 +42,31 @@ let main argv =
 
     let pack_dirs = [
         "core"
-        "ugly" 
-        "provider.dynamic_cdecl" 
-        "provider.dynamic_stdcall" 
-        "provider.internal" 
-        "provider.winsqlite3" 
-        "provider.e_sqlite3" 
-        "provider.e_sqlcipher" 
+        "ugly"
+        "provider.dynamic_cdecl"
+        "provider.dynamic_stdcall"
+        "provider.internal"
+        "provider.winsqlite3"
+        "provider.e_sqlite3"
+        "provider.e_sqlcipher"
+        "provider.e_sqlite3mc"
+        "provider.sqlite3"
+        "provider.sqlcipher"
         "provider.sqlite3mc"
-        "provider.sqlite3" 
-        "provider.sqlcipher" 
         "lib.e_sqlite3.android"
         "lib.e_sqlite3.ios"
         "lib.e_sqlite3.tvos"
         "lib.e_sqlcipher.android"
         "lib.e_sqlcipher.ios"
-        "lib.sqlite3mc.android"
-        "lib.sqlite3mc.ios"
+        "lib.e_sqlite3mc.android"
+        "lib.e_sqlite3mc.ios"
         "lib.e_sqlite3"
         "lib.e_sqlcipher"
-        "lib.sqlite3mc"
+        "lib.e_sqlite3mc"
         "bundle_green"
         "bundle_e_sqlite3"
         "bundle_e_sqlcipher"
-        "bundle_sqlite3mc"
+        "bundle_e_sqlite3mc"
         "bundle_zetetic"
         "bundle_winsqlite3"
         "bundle_sqlite3"
@@ -92,7 +93,7 @@ let main argv =
     let real_xunit_dirs = [
         yield "e_sqlite3"
         yield "e_sqlcipher"
-        yield "sqlite3mc"
+        yield "e_sqlite3mc"
         // TODO do bundle_sqlite3 real_xunit here?
         if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then yield "winsqlite3"
         ]
@@ -106,7 +107,7 @@ let main argv =
     let fake_xunit_dirs = [
         yield "e_sqlite3"
         yield "e_sqlcipher"
-        yield "sqlite3mc"
+        yield "e_sqlite3mc"
         if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then yield "winsqlite3"
         yield "sqlite3"
         ]
@@ -124,7 +125,7 @@ let main argv =
         let args = "run -f net6.0-windows -r win-x86 --no-self-contained"
         exec "dotnet" args (Path.Combine(top, "test_nupkgs", "e_sqlite3", "fake_xunit"))
         exec "dotnet" args (Path.Combine(top, "test_nupkgs", "e_sqlcipher", "fake_xunit"))
-        exec "dotnet" args (Path.Combine(top, "test_nupkgs", "sqlite3mc", "fake_xunit"))
+        exec "dotnet" args (Path.Combine(top, "test_nupkgs", "e_sqlite3mc", "fake_xunit"))
 #endif
 
     printfn "generating push.bat"
diff --git a/gen_lib_nuspecs/Program.cs b/gen_lib_nuspecs/Program.cs
index 22cba0e5..773e9b2e 100644
--- a/gen_lib_nuspecs/Program.cs
+++ b/gen_lib_nuspecs/Program.cs
@@ -164,7 +164,7 @@ static string AsString_basename_in_cb(this WhichLib e)
         {
             case WhichLib.E_SQLITE3: return "e_sqlite3";
             case WhichLib.E_SQLCIPHER: return "e_sqlcipher"; // TODO no e_ prefix in cb yet
-            case WhichLib.SQLITE3MC: return "sqlite3mc";
+            case WhichLib.E_SQLITE3MC: return "e_sqlite3mc";
             default:
                 throw new NotImplementedException(string.Format("WhichLib.AsString for {0}", e));
         }
@@ -176,7 +176,7 @@ static string AsString_basename_in_nupkg(this WhichLib e)
         {
             case WhichLib.E_SQLITE3: return "e_sqlite3";
             case WhichLib.E_SQLCIPHER: return "e_sqlcipher";
-            case WhichLib.SQLITE3MC: return "sqlite3mc";
+            case WhichLib.E_SQLITE3MC: return "e_sqlite3mc";
             default:
                 throw new NotImplementedException(string.Format("WhichLib.AsString for {0}", e));
         }
@@ -602,9 +602,9 @@ private static void gen_nuspec_lib_e_sqlcipher(string dir_src)
         }
     }
 
-    private static void gen_nuspec_lib_sqlite3mc(string dir_src)
+    private static void gen_nuspec_lib_e_sqlite3mc(string dir_src)
     {
-        string id = string.Format("{0}.lib.sqlite3mc", common.ROOT_NAME);
+        string id = string.Format("{0}.lib.e_sqlite3mc", common.ROOT_NAME);
 
         var settings = common.XmlWriterSettings_default();
         settings.OmitXmlDeclaration = false;
@@ -628,14 +628,14 @@ private static void gen_nuspec_lib_sqlite3mc(string dir_src)
 
             f.WriteStartElement("files");
 
-            write_nuspec_file_entries_from_cb(WhichLib.SQLITE3MC, "v142", f);
+            write_nuspec_file_entries_from_cb(WhichLib.E_SQLITE3MC, "v142", f);
 
             {
                 var tname = string.Format("{0}.targets", id);
                 Directory.CreateDirectory(Path.Combine(dir_proj, "net461"));
                 var path_targets = Path.Combine(dir_proj, "net461", tname);
                 var relpath_targets = nuget_path_combine(".", "net461", tname);
-                gen_nuget_targets(path_targets, WhichLib.SQLITE3MC);
+                gen_nuget_targets(path_targets, WhichLib.E_SQLITE3MC);
                 common.write_nuspec_file_entry(
                     relpath_targets,
                     string.Format("buildTransitive\\{0}", TFM.NET461.AsString()),
@@ -643,9 +643,9 @@ private static void gen_nuspec_lib_sqlite3mc(string dir_src)
                     );
             }
 
-            write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.SQLITE3MC, TFM.NET60, f);
-            write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.SQLITE3MC, TFM.NET70, f);
-            write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.SQLITE3MC, TFM.NET80, f);
+            write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLITE3MC, TFM.NET60, f);
+            write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLITE3MC, TFM.NET70, f);
+            write_nuspec_wasm_targets_file_entry(dir_src, id, WhichLib.E_SQLITE3MC, TFM.NET80, f);
 
             // TODO need a comment here to explain these
             common.write_empty(f, TFM.NET461);
@@ -664,7 +664,7 @@ enum WhichLib
         NONE,
         E_SQLITE3,
         E_SQLCIPHER,
-        SQLITE3MC,
+        E_SQLITE3MC,
     }
 
     static LibSuffix get_lib_suffix_from_rid(string rid)
@@ -939,7 +939,7 @@ public static void Main(string[] args)
 
         gen_nuspec_lib_e_sqlite3(dir_src);
         gen_nuspec_lib_e_sqlcipher(dir_src);
-        gen_nuspec_lib_sqlite3mc(dir_src);
+        gen_nuspec_lib_e_sqlite3mc(dir_src);
     }
 }
 
diff --git a/gen_providers/Program.fs b/gen_providers/Program.fs
index ec381451..b74dfba5 100644
--- a/gen_providers/Program.fs
+++ b/gen_providers/Program.fs
@@ -21,7 +21,7 @@ let main argv =
     // TODO the arg list for this function has become ridiculous
     let gen_provider provider_basename (dllimport_name:string) (subname : string option) conv kind ftr_win32dir ftr_funcptrs ftr_key ftr_loadextension =
         let dir_name = sprintf "SQLitePCLRaw.provider.%s" provider_basename
-        let cs_name = 
+        let cs_name =
             match subname with
             | Some subname ->
                 sprintf "provider_%s_%s.cs" (provider_basename.ToLower()) (subname.ToLower())
@@ -30,8 +30,8 @@ let main argv =
         let cs_dir = Path.Combine(top, "src", dir_name, "Generated")
         Directory.CreateDirectory(cs_dir) |> ignore
         let cs_path = Path.Combine(cs_dir, cs_name)
-        let dllimport_name_arg = 
-            if kind = "dynamic" then "" 
+        let dllimport_name_arg =
+            if kind = "dynamic" then ""
             else $"-p:NAME_FOR_DLLIMPORT=%s{dllimport_name}"
         // TODO want to change this to the local tool
         let args = $"-o %s{cs_path} -p:NAME=%s{provider_basename} -p:CONV=%s{conv} -p:KIND=%s{kind} -p:FEATURE_FUNCPTRS=%s{ftr_funcptrs} -p:FEATURE_WIN32DIR=%s{ftr_win32dir} -p:FEATURE_KEY=%s{ftr_key} -p:FEATURE_LOADEXTENSION=%s{ftr_loadextension} %s{dllimport_name_arg} provider.tt"
@@ -67,10 +67,11 @@ let main argv =
         gen_provider s s (Some subname_funcptrs_win) "Cdecl" "dllimport" "FEATURE_WIN32DIR/true" "FEATURE_FUNCPTRS/callingconv" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/true"
         gen_provider s s (Some subname_funcptrs_notwin) "Cdecl" "dllimport" "FEATURE_WIN32DIR/false" "FEATURE_FUNCPTRS/plain" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/true"
 
-    gen_provider "sqlite3mc" "sqlite3mc" (Some subname_prenet5_win) "Cdecl" "dllimport" "FEATURE_WIN32DIR/true" "FEATURE_FUNCPTRS/false" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/false"
-    gen_provider "sqlite3mc" "sqlite3mc" (Some subname_prenet5_notwin) "Cdecl" "dllimport" "FEATURE_WIN32DIR/false" "FEATURE_FUNCPTRS/false" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/false"
-    gen_provider "sqlite3mc" "sqlite3mc" (Some subname_funcptrs_win) "Cdecl" "dllimport" "FEATURE_WIN32DIR/true" "FEATURE_FUNCPTRS/callingconv" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/true"
-    gen_provider "sqlite3mc" "sqlite3mc" (Some subname_funcptrs_notwin) "Cdecl" "dllimport" "FEATURE_WIN32DIR/false" "FEATURE_FUNCPTRS/plain" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/true"
+    for s in ["e_sqlite3mc"; "sqlite3mc"; ] do
+        gen_provider s s (Some subname_prenet5_win) "Cdecl" "dllimport" "FEATURE_WIN32DIR/true" "FEATURE_FUNCPTRS/false" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/false"
+        gen_provider s s (Some subname_prenet5_notwin) "Cdecl" "dllimport" "FEATURE_WIN32DIR/false" "FEATURE_FUNCPTRS/false" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/false"
+        gen_provider s s (Some subname_funcptrs_win) "Cdecl" "dllimport" "FEATURE_WIN32DIR/true" "FEATURE_FUNCPTRS/callingconv" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/true"
+        gen_provider s s (Some subname_funcptrs_notwin) "Cdecl" "dllimport" "FEATURE_WIN32DIR/false" "FEATURE_FUNCPTRS/plain" "FEATURE_KEY/true" "FEATURE_LOADEXTENSION/true"
 
     0 // return an integer exit code
 
diff --git a/sn/SQLitePCLRaw.lib.sqlite3mc.snk b/sn/SQLitePCLRaw.lib.e_sqlite3mc.snk
similarity index 100%
rename from sn/SQLitePCLRaw.lib.sqlite3mc.snk
rename to sn/SQLitePCLRaw.lib.e_sqlite3mc.snk
diff --git a/sn/SQLitePCLRaw.provider.e_sqlite3mc.snk b/sn/SQLitePCLRaw.provider.e_sqlite3mc.snk
new file mode 100644
index 00000000..04d59b35
Binary files /dev/null and b/sn/SQLitePCLRaw.provider.e_sqlite3mc.snk differ
diff --git a/sn/SQLitePCLRaw.provider.sqlite3mc.snk b/sn/SQLitePCLRaw.provider.sqlite3mc.snk
index 04d59b35..795dd306 100644
Binary files a/sn/SQLitePCLRaw.provider.sqlite3mc.snk and b/sn/SQLitePCLRaw.provider.sqlite3mc.snk differ
diff --git a/src/SQLitePCLRaw.bundle_sqlite3mc/SQLitePCLRaw.bundle_sqlite3mc.csproj b/src/SQLitePCLRaw.bundle_e_sqlite3mc/SQLitePCLRaw.bundle_e_sqlite3mc.csproj
similarity index 68%
rename from src/SQLitePCLRaw.bundle_sqlite3mc/SQLitePCLRaw.bundle_sqlite3mc.csproj
rename to src/SQLitePCLRaw.bundle_e_sqlite3mc/SQLitePCLRaw.bundle_e_sqlite3mc.csproj
index 1b7e6f28..3b20ce58 100644
--- a/src/SQLitePCLRaw.bundle_sqlite3mc/SQLitePCLRaw.bundle_sqlite3mc.csproj
+++ b/src/SQLitePCLRaw.bundle_e_sqlite3mc/SQLitePCLRaw.bundle_e_sqlite3mc.csproj
@@ -3,24 +3,24 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;$(tfm_net6_ios);$(tfm_net6_maccatalyst);$(tfm_net6_android);$(tfm_classic_ios);$(tfm_classic_android);net461</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
-	<PackageId>SQLitePCLRaw.bundle_sqlite3mc</PackageId>
+	<PackageId>SQLitePCLRaw.bundle_e_sqlite3mc</PackageId>
 	<AssemblyName>SQLitePCLRaw.batteries_v2</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.batteries_v2.snk</AssemblyOriginatorKeyFile>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <PackageDescription>This 'batteries-included' bundle brings in SQLitePCLRaw.core and the necessary stuff for certain common use cases.  Call SQLitePCL.Batteries.Init().  Policy of this bundle: sqlite3mc included</PackageDescription>
+    <PackageDescription>This 'batteries-included' bundle brings in SQLitePCLRaw.core and the necessary stuff for certain common use cases.  Call SQLitePCL.Batteries.Init().  Policy of this bundle: e_sqlite3mc included</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="..\..\src\common\batteries_v2.cs" />
   </ItemGroup>
 
-  <Import Condition=" '$(TargetFramework)' == 'netstandard2.0' " Project="..\msbuild_bundle_fragments\sqlite3mc_dllimport.xml" />
-  <Import Condition=" '$(TargetFramework)' == '$(tfm_net6_ios)' " Project="..\msbuild_bundle_fragments\sqlite3mc_ios.xml" />
-  <Import Condition=" '$(TargetFramework)' == '$(tfm_net6_maccatalyst)' " Project="..\msbuild_bundle_fragments\sqlite3mc_dllimport.xml" />
-  <Import Condition=" '$(TargetFramework)' == '$(tfm_net6_android)' " Project="..\msbuild_bundle_fragments\sqlite3mc_android.xml" />
-  <Import Condition=" '$(TargetFramework)' == '$(tfm_classic_ios)' " Project="..\msbuild_bundle_fragments\sqlite3mc_ios.xml" />
-  <Import Condition=" '$(TargetFramework)' == '$(tfm_classic_android)' " Project="..\msbuild_bundle_fragments\sqlite3mc_android.xml" />
-  <Import Condition=" '$(TargetFramework)' == 'net461' " Project="..\msbuild_bundle_fragments\sqlite3mc_dynamic.xml" />
+  <Import Condition=" '$(TargetFramework)' == 'netstandard2.0' " Project="..\msbuild_bundle_fragments\e_sqlite3mc_dllimport.xml" />
+  <Import Condition=" '$(TargetFramework)' == '$(tfm_net6_ios)' " Project="..\msbuild_bundle_fragments\e_sqlite3mc_ios.xml" />
+  <Import Condition=" '$(TargetFramework)' == '$(tfm_net6_maccatalyst)' " Project="..\msbuild_bundle_fragments\e_sqlite3mc_dllimport.xml" />
+  <Import Condition=" '$(TargetFramework)' == '$(tfm_net6_android)' " Project="..\msbuild_bundle_fragments\e_sqlite3mc_android.xml" />
+  <Import Condition=" '$(TargetFramework)' == '$(tfm_classic_ios)' " Project="..\msbuild_bundle_fragments\e_sqlite3mc_ios.xml" />
+  <Import Condition=" '$(TargetFramework)' == '$(tfm_classic_android)' " Project="..\msbuild_bundle_fragments\e_sqlite3mc_android.xml" />
+  <Import Condition=" '$(TargetFramework)' == 'net461' " Project="..\msbuild_bundle_fragments\e_sqlite3mc_dynamic.xml" />
 
 </Project>
 
diff --git a/src/SQLitePCLRaw.lib.sqlite3mc.android/SQLitePCLRaw.lib.sqlite3mc.android.csproj b/src/SQLitePCLRaw.lib.e_sqlite3mc.android/SQLitePCLRaw.lib.e_sqlite3mc.android.csproj
similarity index 71%
rename from src/SQLitePCLRaw.lib.sqlite3mc.android/SQLitePCLRaw.lib.sqlite3mc.android.csproj
rename to src/SQLitePCLRaw.lib.e_sqlite3mc.android/SQLitePCLRaw.lib.e_sqlite3mc.android.csproj
index e7cfbc82..3176eaef 100644
--- a/src/SQLitePCLRaw.lib.sqlite3mc.android/SQLitePCLRaw.lib.sqlite3mc.android.csproj
+++ b/src/SQLitePCLRaw.lib.e_sqlite3mc.android/SQLitePCLRaw.lib.e_sqlite3mc.android.csproj
@@ -3,7 +3,7 @@
 		<TargetFrameworks>$(tfm_net6_android);$(tfm_classic_android)</TargetFrameworks>
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.sqlite3mc.snk</AssemblyOriginatorKeyFile>
+		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlite3mc.snk</AssemblyOriginatorKeyFile>
         <PackageDescription>This package contains platform-specific native code builds of SQLite3 Multiple Ciphers (see utelle/SQLite3MultipleCiphers on GitHub) for use with SQLitePCLRaw.  To use this package, you need SQLitePCLRaw.core as well as one of the SQLitePCLRaw.provider.* packages.  Convenience packages are named SQLitePCLRaw.bundle_*.</PackageDescription>
 	</PropertyGroup>
 
@@ -11,26 +11,26 @@
     <Compile Include="..\..\src\common\embedded_init.cs" />
 </ItemGroup>
 
-  <PropertyGroup Label="Android DesignTimeBuild error workaround"> 
+  <PropertyGroup Label="Android DesignTimeBuild error workaround">
     <DesignTimeBuild>false</DesignTimeBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedNativeLibrary Include="$([System.IO.Path]::Combine($(cb_bin_path), 'sqlite3mc', 'android', 'x86', 'libsqlite3mc.so'))">
+    <EmbeddedNativeLibrary Include="$([System.IO.Path]::Combine($(cb_bin_path), 'e_sqlite3mc', 'android', 'x86', 'libe_sqlite3mc.so'))">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>x86\libsqlite3mc.so</Link>
+      <Link>x86\libe_sqlite3mc.so</Link>
     </EmbeddedNativeLibrary>
-    <EmbeddedNativeLibrary Include="$([System.IO.Path]::Combine($(cb_bin_path), 'sqlite3mc', 'android', 'x86_64', 'libsqlite3mc.so'))">
+    <EmbeddedNativeLibrary Include="$([System.IO.Path]::Combine($(cb_bin_path), 'e_sqlite3mc', 'android', 'x86_64', 'libe_sqlite3mc.so'))">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>x86_64\libsqlite3mc.so</Link>
+      <Link>x86_64\libe_sqlite3mc.so</Link>
     </EmbeddedNativeLibrary>
-    <EmbeddedNativeLibrary Include="$([System.IO.Path]::Combine($(cb_bin_path), 'sqlite3mc', 'android', 'arm64-v8a', 'libsqlite3mc.so'))">
+    <EmbeddedNativeLibrary Include="$([System.IO.Path]::Combine($(cb_bin_path), 'e_sqlite3mc', 'android', 'arm64-v8a', 'libe_sqlite3mc.so'))">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>arm64-v8a\libsqlite3mc.so</Link>
+      <Link>arm64-v8a\libe_sqlite3mc.so</Link>
     </EmbeddedNativeLibrary>
-    <EmbeddedNativeLibrary Include="$([System.IO.Path]::Combine($(cb_bin_path), 'sqlite3mc', 'android', 'armeabi-v7a', 'libsqlite3mc.so'))">
+    <EmbeddedNativeLibrary Include="$([System.IO.Path]::Combine($(cb_bin_path), 'e_sqlite3mc', 'android', 'armeabi-v7a', 'libe_sqlite3mc.so'))">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <Link>armeabi-v7a\libsqlite3mc.so</Link>
+      <Link>armeabi-v7a\libe_sqlite3mc.so</Link>
     </EmbeddedNativeLibrary>
   </ItemGroup>
 
diff --git a/src/SQLitePCLRaw.lib.sqlite3mc.ios/SQLitePCLRaw.lib.sqlite3mc.ios.csproj b/src/SQLitePCLRaw.lib.e_sqlite3mc.ios/SQLitePCLRaw.lib.e_sqlite3mc.ios.csproj
similarity index 54%
rename from src/SQLitePCLRaw.lib.sqlite3mc.ios/SQLitePCLRaw.lib.sqlite3mc.ios.csproj
rename to src/SQLitePCLRaw.lib.e_sqlite3mc.ios/SQLitePCLRaw.lib.e_sqlite3mc.ios.csproj
index 36c0b40d..8e5c0e21 100644
--- a/src/SQLitePCLRaw.lib.sqlite3mc.ios/SQLitePCLRaw.lib.sqlite3mc.ios.csproj
+++ b/src/SQLitePCLRaw.lib.e_sqlite3mc.ios/SQLitePCLRaw.lib.e_sqlite3mc.ios.csproj
@@ -3,15 +3,15 @@
 		<TargetFrameworks>$(tfm_net6_ios);$(tfm_classic_ios)</TargetFrameworks>
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.sqlite3mc.snk</AssemblyOriginatorKeyFile>
+		<AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.lib.e_sqlite3mc.snk</AssemblyOriginatorKeyFile>
 		<PackageDescription>This package contains platform-specific native code builds of SQLite3 Multiple Ciphers (see utelle/SQLite3MultipleCiphers on GitHub) for use with SQLitePCLRaw.  To use this package, you need SQLitePCLRaw.core as well as one of the SQLitePCLRaw.provider.* packages.  Convenience packages are named SQLitePCLRaw.bundle_*.</PackageDescription>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Include="$(cb_bin_path)\sqlite3mc\ios\device\sqlite3mc.a" Pack="true" PackagePath="static\device" />
-		<None Include="$(cb_bin_path)\sqlite3mc\ios\simulator\sqlite3mc.a" Pack="true" PackagePath="static\simulator" />
-		<None Include="SQLitePCLRaw.lib.sqlite3mc.ios.targets" Pack="true" PackagePath="build" />
-		<None Include="SQLitePCLRaw.lib.sqlite3mc.ios.targets" Pack="true" PackagePath="buildTransitive" />
+		<None Include="$(cb_bin_path)\e_sqlite3mc\ios\device\e_sqlite3mc.a" Pack="true" PackagePath="static\device" />
+		<None Include="$(cb_bin_path)\e_sqlite3mc\ios\simulator\e_sqlite3mc.a" Pack="true" PackagePath="static\simulator" />
+		<None Include="SQLitePCLRaw.lib.e_sqlite3mc.ios.targets" Pack="true" PackagePath="build" />
+		<None Include="SQLitePCLRaw.lib.e_sqlite3mc.ios.targets" Pack="true" PackagePath="buildTransitive" />
 	</ItemGroup>
 </Project>
 
diff --git a/src/SQLitePCLRaw.lib.sqlite3mc.ios/SQLitePCLRaw.lib.sqlite3mc.ios.targets b/src/SQLitePCLRaw.lib.e_sqlite3mc.ios/SQLitePCLRaw.lib.e_sqlite3mc.ios.targets
similarity index 93%
rename from src/SQLitePCLRaw.lib.sqlite3mc.ios/SQLitePCLRaw.lib.sqlite3mc.ios.targets
rename to src/SQLitePCLRaw.lib.e_sqlite3mc.ios/SQLitePCLRaw.lib.e_sqlite3mc.ios.targets
index 8c2dff7f..e64fbbf3 100644
--- a/src/SQLitePCLRaw.lib.sqlite3mc.ios/SQLitePCLRaw.lib.sqlite3mc.ios.targets
+++ b/src/SQLitePCLRaw.lib.e_sqlite3mc.ios/SQLitePCLRaw.lib.e_sqlite3mc.ios.targets
@@ -1,13 +1,13 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Condition="'$(RuntimeIdentifier)'=='ios-arm64' or '$(ComputedPlatform)'=='iPhone'">
-    <NativeReference Include="$(MSBuildThisFileDirectory)..\static\device\sqlite3mc.a">
+    <NativeReference Include="$(MSBuildThisFileDirectory)..\static\device\e_sqlite3mc.a">
       <Kind>Static</Kind>
       <SmartLink>False</SmartLink>
       <ForceLoad>true</ForceLoad>
     </NativeReference>
   </ItemGroup>
   <ItemGroup Condition="'$(RuntimeIdentifier)'=='iossimulator-arm64' or '$(RuntimeIdentifier)'=='iossimulator-x64' or '$(ComputedPlatform)'=='iPhoneSimulator'">
-    <NativeReference Include="$(MSBuildThisFileDirectory)..\static\simulator\sqlite3mc.a">
+    <NativeReference Include="$(MSBuildThisFileDirectory)..\static\simulator\e_sqlite3mc.a">
       <Kind>Static</Kind>
       <SmartLink>False</SmartLink>
       <ForceLoad>true</ForceLoad>
diff --git a/src/SQLitePCLRaw.provider.e_sqlite3mc/SQLitePCLRaw.provider.e_sqlite3mc.csproj b/src/SQLitePCLRaw.provider.e_sqlite3mc/SQLitePCLRaw.provider.e_sqlite3mc.csproj
new file mode 100644
index 00000000..309c7365
--- /dev/null
+++ b/src/SQLitePCLRaw.provider.e_sqlite3mc/SQLitePCLRaw.provider.e_sqlite3mc.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net6.0;net6.0-windows</TargetFrameworks>
+    <LangVersion>$(ProviderLangVersion)</LangVersion>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.provider.e_sqlite3mc.snk</AssemblyOriginatorKeyFile>
+    <PackageDescription>SQLitePCLRaw is a Portable Class Library (PCL) for low-level (raw) access to SQLite.  Packages named 'SQLitePCLRaw.provider.*' (like this one) are 'plugins' that allow SQLitePCLRaw.core to access the native SQLite library.  This provider does DllImport of 'e_sqlite3mc', the SQLite3 Multiple Ciphers builds provided with SQLitePCLRaw.</PackageDescription>
+  </PropertyGroup>
+
+<ItemGroup>
+	<ProjectReference Include="..\SQLitePCLRaw.core\SQLitePCLRaw.core.csproj" />
+</ItemGroup>
+
+<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <Compile Include="Generated\provider_e_sqlite3mc_prenet5_win.cs" />
+</ItemGroup>
+
+<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <Compile Include="Generated\provider_e_sqlite3mc_funcptrs_notwin.cs" />
+</ItemGroup>
+
+<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-windows' ">
+    <Compile Include="Generated\provider_e_sqlite3mc_funcptrs_win.cs" />
+</ItemGroup>
+
+</Project>
diff --git a/src/SQLitePCLRaw.provider.sqlite3mc/SQLitePCLRaw.provider.sqlite3mc.csproj b/src/SQLitePCLRaw.provider.sqlite3mc/SQLitePCLRaw.provider.sqlite3mc.csproj
index 5fc59f2d..533b863e 100644
--- a/src/SQLitePCLRaw.provider.sqlite3mc/SQLitePCLRaw.provider.sqlite3mc.csproj
+++ b/src/SQLitePCLRaw.provider.sqlite3mc/SQLitePCLRaw.provider.sqlite3mc.csproj
@@ -7,7 +7,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\sn\SQLitePCLRaw.provider.sqlite3mc.snk</AssemblyOriginatorKeyFile>
-    <PackageDescription>SQLitePCLRaw is a Portable Class Library (PCL) for low-level (raw) access to SQLite.  Packages named 'SQLitePCLRaw.provider.*' (like this one) are 'plugins' that allow SQLitePCLRaw.core to access the native SQLite library.  This provider does DllImport of 'sqlite3mc', the SQLite3 Multiple Ciphers builds provided with SQLitePCLRaw.</PackageDescription>
+    <PackageDescription>SQLitePCLRaw is a Portable Class Library (PCL) for low-level (raw) access to SQLite.  Packages named 'SQLitePCLRaw.provider.*' (like this one) are 'plugins' that allow SQLitePCLRaw.core to access the native SQLite library.  This provider does DllImport of 'sqlite3mc', to reference the 'system' SQLite3 Multiple Ciphers. One common use for this provider is to access the SQLite3 Multiple Ciphers library installed from source.</PackageDescription>
   </PropertyGroup>
 
 <ItemGroup>
diff --git a/src/common/batteries_v2.cs b/src/common/batteries_v2.cs
index 75422e62..4502c3ce 100644
--- a/src/common/batteries_v2.cs
+++ b/src/common/batteries_v2.cs
@@ -91,8 +91,8 @@ public static void Init()
 		    SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlite3());
 #elif PROVIDER_e_sqlcipher
 		    SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlcipher());
-#elif PROVIDER_sqlite3mc
-		    SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3mc());
+#elif PROVIDER_e_sqlite3mc
+		    SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlite3mc());
 #elif PROVIDER_sqlcipher
 		    SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlcipher());
 #elif PROVIDER_winsqlite3
@@ -107,8 +107,8 @@ public static void Init()
 		    DoDynamic_cdecl("e_sqlite3", NativeLibrary.WHERE_RUNTIME_RID | NativeLibrary.WHERE_ADJACENT | NativeLibrary.WHERE_CODEBASE);
 #elif PROVIDER_NAME_e_sqlcipher
 		    DoDynamic_cdecl("e_sqlcipher", NativeLibrary.WHERE_RUNTIME_RID | NativeLibrary.WHERE_ADJACENT);
-#elif PROVIDER_NAME_sqlite3mc
-		    DoDynamic_cdecl("sqlite3mc", NativeLibrary.WHERE_RUNTIME_RID | NativeLibrary.WHERE_ADJACENT);
+#elif PROVIDER_NAME_e_sqlite3mc
+		    DoDynamic_cdecl("e_sqlite3mc", NativeLibrary.WHERE_RUNTIME_RID | NativeLibrary.WHERE_ADJACENT);
 #elif PROVIDER_NAME_sqlcipher
 		    DoDynamic_cdecl("sqlcipher", NativeLibrary.WHERE_ARCH); // TODO coordinate with zetetic
 #elif PROVIDER_NAME_winsqlite3
diff --git a/src/msbuild_bundle_fragments/e_sqlite3mc_android.xml b/src/msbuild_bundle_fragments/e_sqlite3mc_android.xml
new file mode 100644
index 00000000..b59f4b70
--- /dev/null
+++ b/src/msbuild_bundle_fragments/e_sqlite3mc_android.xml
@@ -0,0 +1,13 @@
+
+<Project>
+
+  <PropertyGroup>
+	<DefineConstants>$(DefineConstants);PROVIDER_e_sqlite3mc</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+	<ProjectReference Include="..\SQLitePCLRaw.lib.e_sqlite3mc.android\SQLitePCLRaw.lib.e_sqlite3mc.android.csproj" />
+	<ProjectReference Include="..\SQLitePCLRaw.provider.e_sqlite3mc\SQLitePCLRaw.provider.e_sqlite3mc.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/msbuild_bundle_fragments/e_sqlite3mc_dllimport.xml b/src/msbuild_bundle_fragments/e_sqlite3mc_dllimport.xml
new file mode 100644
index 00000000..404e5445
--- /dev/null
+++ b/src/msbuild_bundle_fragments/e_sqlite3mc_dllimport.xml
@@ -0,0 +1,13 @@
+<Project>
+
+  <PropertyGroup>
+	<DefineConstants>$(DefineConstants);PROVIDER_e_sqlite3mc</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+	<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3mc" Version="$(version)" />
+	<ProjectReference Include="..\SQLitePCLRaw.provider.e_sqlite3mc\SQLitePCLRaw.provider.e_sqlite3mc.csproj" />
+  </ItemGroup>
+
+</Project>
+
diff --git a/src/msbuild_bundle_fragments/sqlite3mc_dynamic.xml b/src/msbuild_bundle_fragments/e_sqlite3mc_dynamic.xml
similarity index 76%
rename from src/msbuild_bundle_fragments/sqlite3mc_dynamic.xml
rename to src/msbuild_bundle_fragments/e_sqlite3mc_dynamic.xml
index dcf14eae..27b4b32d 100644
--- a/src/msbuild_bundle_fragments/sqlite3mc_dynamic.xml
+++ b/src/msbuild_bundle_fragments/e_sqlite3mc_dynamic.xml
@@ -1,11 +1,11 @@
 <Project>
 
   <PropertyGroup>
-	<DefineConstants>$(DefineConstants);PROVIDER_dynamic;PROVIDER_dynamic_cdecl;PROVIDER_NAME_sqlite3mc</DefineConstants>
+	<DefineConstants>$(DefineConstants);PROVIDER_dynamic;PROVIDER_dynamic_cdecl;PROVIDER_NAME_e_sqlite3mc</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="SQLitePCLRaw.lib.sqlite3mc" Version="$(version)" />
+	<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3mc" Version="$(version)" />
 	<ProjectReference Include="..\SQLitePCLRaw.provider.dynamic_cdecl\SQLitePCLRaw.provider.dynamic_cdecl.csproj" />
   </ItemGroup>
 
diff --git a/src/msbuild_bundle_fragments/sqlite3mc_ios.xml b/src/msbuild_bundle_fragments/e_sqlite3mc_ios.xml
similarity index 71%
rename from src/msbuild_bundle_fragments/sqlite3mc_ios.xml
rename to src/msbuild_bundle_fragments/e_sqlite3mc_ios.xml
index 4f1f821e..0c8fbf7c 100644
--- a/src/msbuild_bundle_fragments/sqlite3mc_ios.xml
+++ b/src/msbuild_bundle_fragments/e_sqlite3mc_ios.xml
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<ProjectReference Include="..\SQLitePCLRaw.lib.sqlite3mc.ios\SQLitePCLRaw.lib.sqlite3mc.ios.csproj" />
+	<ProjectReference Include="..\SQLitePCLRaw.lib.e_sqlite3mc.ios\SQLitePCLRaw.lib.e_sqlite3mc.ios.csproj" />
 	<ProjectReference Include="..\SQLitePCLRaw.provider.internal\SQLitePCLRaw.provider.internal.csproj" />
   </ItemGroup>
 
diff --git a/src/msbuild_bundle_fragments/sqlite3mc_android.xml b/src/msbuild_bundle_fragments/sqlite3mc_android.xml
deleted file mode 100644
index 35397ca4..00000000
--- a/src/msbuild_bundle_fragments/sqlite3mc_android.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<Project>
-
-  <PropertyGroup>
-	<DefineConstants>$(DefineConstants);PROVIDER_sqlite3mc</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-	<ProjectReference Include="..\SQLitePCLRaw.lib.sqlite3mc.android\SQLitePCLRaw.lib.sqlite3mc.android.csproj" />
-	<ProjectReference Include="..\SQLitePCLRaw.provider.sqlite3mc\SQLitePCLRaw.provider.sqlite3mc.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/msbuild_bundle_fragments/sqlite3mc_dllimport.xml b/src/msbuild_bundle_fragments/sqlite3mc_dllimport.xml
deleted file mode 100644
index 76807878..00000000
--- a/src/msbuild_bundle_fragments/sqlite3mc_dllimport.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-	<DefineConstants>$(DefineConstants);PROVIDER_sqlite3mc</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-	<PackageReference Include="SQLitePCLRaw.lib.sqlite3mc" Version="$(version)" />
-	<ProjectReference Include="..\SQLitePCLRaw.provider.sqlite3mc\SQLitePCLRaw.provider.sqlite3mc.csproj" />
-  </ItemGroup>
-
-</Project>
-
diff --git a/test_nupkgs/sqlite3mc/fake_xunit/Program.cs b/test_nupkgs/e_sqlite3mc/fake_xunit/Program.cs
similarity index 100%
rename from test_nupkgs/sqlite3mc/fake_xunit/Program.cs
rename to test_nupkgs/e_sqlite3mc/fake_xunit/Program.cs
diff --git a/test_nupkgs/sqlite3mc/fake_xunit/sqlite3mc_with_fake_xunit.csproj b/test_nupkgs/e_sqlite3mc/fake_xunit/e_sqlite3mc_with_fake_xunit.csproj
similarity index 87%
rename from test_nupkgs/sqlite3mc/fake_xunit/sqlite3mc_with_fake_xunit.csproj
rename to test_nupkgs/e_sqlite3mc/fake_xunit/e_sqlite3mc_with_fake_xunit.csproj
index 45fe6b7e..9e9b57de 100644
--- a/test_nupkgs/sqlite3mc/fake_xunit/sqlite3mc_with_fake_xunit.csproj
+++ b/test_nupkgs/e_sqlite3mc/fake_xunit/e_sqlite3mc_with_fake_xunit.csproj
@@ -8,7 +8,7 @@
       <RuntimeIdentifier>win-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="sqlitepclraw.bundle_sqlite3mc" Version="$(pkg_version_for_testing)" />
+    <PackageReference Include="sqlitepclraw.bundle_e_sqlite3mc" Version="$(pkg_version_for_testing)" />
     <PackageReference Include="sqlitepclraw.ugly" Version="$(pkg_version_for_testing)" />
   </ItemGroup>
   <ItemGroup>
diff --git a/test_nupkgs/sqlite3mc/real_xunit/sqlite3mc_with_real_xunit.csproj b/test_nupkgs/e_sqlite3mc/real_xunit/e_sqlite3mc_with_real_xunit.csproj
similarity index 90%
rename from test_nupkgs/sqlite3mc/real_xunit/sqlite3mc_with_real_xunit.csproj
rename to test_nupkgs/e_sqlite3mc/real_xunit/e_sqlite3mc_with_real_xunit.csproj
index 61a933d8..42f7723b 100644
--- a/test_nupkgs/sqlite3mc/real_xunit/sqlite3mc_with_real_xunit.csproj
+++ b/test_nupkgs/e_sqlite3mc/real_xunit/e_sqlite3mc_with_real_xunit.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="xunit" Version="$(depversion_xunit)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(depversion_xunit_runner_visualstudio)" />
 
-    <PackageReference Include="sqlitepclraw.bundle_sqlite3mc" Version="$(pkg_version_for_testing)" />
+    <PackageReference Include="sqlitepclraw.bundle_e_sqlite3mc" Version="$(pkg_version_for_testing)" />
     <PackageReference Include="sqlitepclraw.ugly" Version="$(pkg_version_for_testing)" />
   </ItemGroup>
   <ItemGroup>
diff --git a/test_nupkgs/sqlite3mc/real_xunit/xunit.runner.json b/test_nupkgs/e_sqlite3mc/real_xunit/xunit.runner.json
similarity index 100%
rename from test_nupkgs/sqlite3mc/real_xunit/xunit.runner.json
rename to test_nupkgs/e_sqlite3mc/real_xunit/xunit.runner.json