diff --git a/EFCore.NamingConventions/EFCore.NamingConventions.csproj b/EFCore.NamingConventions/EFCore.NamingConventions.csproj
index 017b10e..2414276 100644
--- a/EFCore.NamingConventions/EFCore.NamingConventions.csproj
+++ b/EFCore.NamingConventions/EFCore.NamingConventions.csproj
@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AssemblyName>EFCore.NamingConventions</AssemblyName>
-    <RootNamespace>EFCore</RootNamespace>
     <TargetFramework>netstandard2.1</TargetFramework>
     <VersionPrefix>5.0.0-rc1</VersionPrefix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/EFCore.NamingConventions/NamingConventions/Internal/INameRewriter.cs b/EFCore.NamingConventions/Internal/INameRewriter.cs
similarity index 100%
rename from EFCore.NamingConventions/NamingConventions/Internal/INameRewriter.cs
rename to EFCore.NamingConventions/Internal/INameRewriter.cs
diff --git a/EFCore.NamingConventions/NamingConventions/Internal/LowerCaseNameRewriter.cs b/EFCore.NamingConventions/Internal/LowerCaseNameRewriter.cs
similarity index 100%
rename from EFCore.NamingConventions/NamingConventions/Internal/LowerCaseNameRewriter.cs
rename to EFCore.NamingConventions/Internal/LowerCaseNameRewriter.cs
diff --git a/EFCore.NamingConventions/NamingConventions/Internal/NameRewritingConvention.cs b/EFCore.NamingConventions/Internal/NameRewritingConvention.cs
similarity index 100%
rename from EFCore.NamingConventions/NamingConventions/Internal/NameRewritingConvention.cs
rename to EFCore.NamingConventions/Internal/NameRewritingConvention.cs
diff --git a/EFCore.NamingConventions/NamingConventions/Internal/NamingConvention.cs b/EFCore.NamingConventions/Internal/NamingConvention.cs
similarity index 100%
rename from EFCore.NamingConventions/NamingConventions/Internal/NamingConvention.cs
rename to EFCore.NamingConventions/Internal/NamingConvention.cs
diff --git a/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionSetPlugin.cs b/EFCore.NamingConventions/Internal/NamingConventionSetPlugin.cs
similarity index 100%
rename from EFCore.NamingConventions/NamingConventions/Internal/NamingConventionSetPlugin.cs
rename to EFCore.NamingConventions/Internal/NamingConventionSetPlugin.cs
diff --git a/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionsOptionsExtension.cs b/EFCore.NamingConventions/Internal/NamingConventionsOptionsExtension.cs
similarity index 100%
rename from EFCore.NamingConventions/NamingConventions/Internal/NamingConventionsOptionsExtension.cs
rename to EFCore.NamingConventions/Internal/NamingConventionsOptionsExtension.cs
diff --git a/EFCore.NamingConventions/NamingConventions/Internal/SnakeCaseNameRewriter.cs b/EFCore.NamingConventions/Internal/SnakeCaseNameRewriter.cs
similarity index 100%
rename from EFCore.NamingConventions/NamingConventions/Internal/SnakeCaseNameRewriter.cs
rename to EFCore.NamingConventions/Internal/SnakeCaseNameRewriter.cs
diff --git a/EFCore.NamingConventions/NamingConventions/Internal/UpperCaseNameRewriter.cs b/EFCore.NamingConventions/Internal/UpperCaseNameRewriter.cs
similarity index 100%
rename from EFCore.NamingConventions/NamingConventions/Internal/UpperCaseNameRewriter.cs
rename to EFCore.NamingConventions/Internal/UpperCaseNameRewriter.cs
diff --git a/EFCore.NamingConventions/NamingConventions/Internal/UpperSnakeCaseNameRewriter.cs b/EFCore.NamingConventions/Internal/UpperSnakeCaseNameRewriter.cs
similarity index 100%
rename from EFCore.NamingConventions/NamingConventions/Internal/UpperSnakeCaseNameRewriter.cs
rename to EFCore.NamingConventions/Internal/UpperSnakeCaseNameRewriter.cs