diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/DataProtectionExtensions.cs b/src/Microsoft.AspNet.DataProtection.Interfaces/DataProtectionExtensions.cs
index bd41d6ba9a..76693edd73 100644
--- a/src/Microsoft.AspNet.DataProtection.Interfaces/DataProtectionExtensions.cs
+++ b/src/Microsoft.AspNet.DataProtection.Interfaces/DataProtectionExtensions.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Security.Cryptography;
+using Microsoft.AspNet.DataProtection.Infrastructure;
 using Microsoft.AspNet.DataProtection.Interfaces;
 using Microsoft.Framework.Internal;
 
diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/IApplicationDiscriminator.cs b/src/Microsoft.AspNet.DataProtection.Interfaces/Infrastructure/IApplicationDiscriminator.cs
similarity index 67%
rename from src/Microsoft.AspNet.DataProtection.Interfaces/IApplicationDiscriminator.cs
rename to src/Microsoft.AspNet.DataProtection.Interfaces/Infrastructure/IApplicationDiscriminator.cs
index 232780a311..23c2764f9d 100644
--- a/src/Microsoft.AspNet.DataProtection.Interfaces/IApplicationDiscriminator.cs
+++ b/src/Microsoft.AspNet.DataProtection.Interfaces/Infrastructure/IApplicationDiscriminator.cs
@@ -2,12 +2,18 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.ComponentModel;
 
-namespace Microsoft.AspNet.DataProtection
+namespace Microsoft.AspNet.DataProtection.Infrastructure
 {
     /// <summary>
     /// Provides information used to discriminate applications.
     /// </summary>
+    /// <remarks>
+    /// This type supports the data protection system and is not intended to be used
+    /// by consumers.
+    /// </remarks>
+    [EditorBrowsable(EditorBrowsableState.Never)]
     public interface IApplicationDiscriminator
     {
         /// <summary>
diff --git a/src/Microsoft.AspNet.DataProtection.SystemWeb/DataProtectionStartup.cs b/src/Microsoft.AspNet.DataProtection.SystemWeb/DataProtectionStartup.cs
index 664a68aa73..ef93c82ad8 100644
--- a/src/Microsoft.AspNet.DataProtection.SystemWeb/DataProtectionStartup.cs
+++ b/src/Microsoft.AspNet.DataProtection.SystemWeb/DataProtectionStartup.cs
@@ -5,6 +5,7 @@ using System;
 using System.Configuration;
 using System.Web;
 using System.Web.Configuration;
+using Microsoft.AspNet.DataProtection.Infrastructure;
 using Microsoft.Framework.DependencyInjection;
 
 namespace Microsoft.AspNet.DataProtection.SystemWeb
diff --git a/test/Microsoft.AspNet.DataProtection.Interfaces.Test/DataProtectionExtensionsTests.cs b/test/Microsoft.AspNet.DataProtection.Interfaces.Test/DataProtectionExtensionsTests.cs
index a174b4a4fa..42deb31f55 100644
--- a/test/Microsoft.AspNet.DataProtection.Interfaces.Test/DataProtectionExtensionsTests.cs
+++ b/test/Microsoft.AspNet.DataProtection.Interfaces.Test/DataProtectionExtensionsTests.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Text;
+using Microsoft.AspNet.DataProtection.Infrastructure;
 using Microsoft.AspNet.DataProtection.Interfaces;
 using Microsoft.AspNet.Testing;
 using Microsoft.Framework.Runtime;