diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerFeature.cs b/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerFeature.cs
rename to src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesFeature.cs
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureDelegate.cs b/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Hosting/Startup/ConfigureDelegate.cs
rename to src/Microsoft.AspNetCore.Hosting/Startup/ConfigureBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesDelegate.cs b/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesDelegate.cs
rename to src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClrAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs
rename to src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClrAttribute.cs