diff --git a/samples/OpenIdConnectSample_casing/OpenIdConnectSample.kproj b/samples/OpenIdConnectSample/OpenIdConnectSample.kproj
similarity index 100%
rename from samples/OpenIdConnectSample_casing/OpenIdConnectSample.kproj
rename to samples/OpenIdConnectSample/OpenIdConnectSample.kproj
diff --git a/samples/OpenIdConnectSample_casing/Startup.cs b/samples/OpenIdConnectSample/Startup.cs
similarity index 100%
rename from samples/OpenIdConnectSample_casing/Startup.cs
rename to samples/OpenIdConnectSample/Startup.cs
diff --git a/samples/OpenIdConnectSample_casing/project.json b/samples/OpenIdConnectSample/project.json
similarity index 100%
rename from samples/OpenIdConnectSample_casing/project.json
rename to samples/OpenIdConnectSample/project.json
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/Microsoft.AspNet.Security.OpenIdConnect.kproj b/src/Microsoft.AspNet.Security.OpenIdConnect/Microsoft.AspNet.Security.OpenIdConnect.kproj
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/Microsoft.AspNet.Security.OpenIdConnect.kproj
rename to src/Microsoft.AspNet.Security.OpenIdConnect/Microsoft.AspNet.Security.OpenIdConnect.kproj
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/NonceCache.cs b/src/Microsoft.AspNet.Security.OpenIdConnect/NonceCache.cs
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/NonceCache.cs
rename to src/Microsoft.AspNet.Security.OpenIdConnect/NonceCache.cs
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/Notifications/AuthorizationCodeReceivedNotification.cs b/src/Microsoft.AspNet.Security.OpenIdConnect/Notifications/AuthorizationCodeReceivedNotification.cs
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/Notifications/AuthorizationCodeReceivedNotification.cs
rename to src/Microsoft.AspNet.Security.OpenIdConnect/Notifications/AuthorizationCodeReceivedNotification.cs
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationDefaults.cs b/src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationDefaults.cs
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationDefaults.cs
rename to src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationDefaults.cs
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationExtensions.cs b/src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationExtensions.cs
rename to src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationExtensions.cs
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationMiddleware.cs
rename to src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationMiddleware.cs
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationNotifications.cs b/src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationNotifications.cs
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationNotifications.cs
rename to src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationNotifications.cs
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationOptions.cs b/src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenIdConnectAuthenticationOptions.cs
rename to src/Microsoft.AspNet.Security.OpenIdConnect/OpenIdConnectAuthenticationOptions.cs
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenidConnectAuthenticationHandler.cs b/src/Microsoft.AspNet.Security.OpenIdConnect/OpenidConnectAuthenticationHandler.cs
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/OpenidConnectAuthenticationHandler.cs
rename to src/Microsoft.AspNet.Security.OpenIdConnect/OpenidConnectAuthenticationHandler.cs
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/Project.json b/src/Microsoft.AspNet.Security.OpenIdConnect/Project.json
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/Project.json
rename to src/Microsoft.AspNet.Security.OpenIdConnect/Project.json
diff --git a/src/Microsoft.AspNet.Security.OpenIdConnect_casing/Resources.Designer.cs b/src/Microsoft.AspNet.Security.OpenIdConnect/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Security.OpenIdConnect_casing/Resources.Designer.cs
rename to src/Microsoft.AspNet.Security.OpenIdConnect/Resources.Designer.cs