diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index 68e55e6d31..43ccd32ef6 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -21,7 +21,7 @@
 {
     @Html.RenderJsHere()
 
-    using (Html.BeginUmbracoForm<ProfileController>("HandleUpdateProfile"))
+    using (Html.BeginUmbracoForm<UmbProfileController>("HandleUpdateProfile"))
     {
         <fieldset>
             <legend>Edit profile</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
index 8208ddfa93..b73669ff51 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
@@ -18,7 +18,7 @@
 
 @Html.RenderJsHere()
 
-@using (Html.BeginUmbracoForm<LoginController>("HandleLogin"))
+@using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
 {
     <fieldset>
         <legend>Login</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
index d889c67391..7d8a1ea609 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
@@ -20,7 +20,7 @@
 {
     <p>You are currently logged in as @loginStatusModel.Name</p>
 
-    using (Html.BeginUmbracoForm<LoginStatusController>("HandleLogout"))
+    using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
     {
          <fieldset>
              <legend>Logout</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index 83899fd776..386a9ad97c 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -45,7 +45,7 @@
 } 
 else 
 {   
-    using (Html.BeginUmbracoForm<RegisterController>("HandleRegisterMember"))
+    using (Html.BeginUmbracoForm<UmbRegisterController>("HandleRegisterMember"))
     {
         <fieldset>
             <legend>Register Member</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
index 80fdff9e68..ed7697721e 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EditProfile.cshtml
@@ -21,7 +21,7 @@
 {
     @Html.RenderJsHere()
 
-    using (Html.BeginUmbracoForm<ProfileController>("HandleUpdateProfile"))
+    using (Html.BeginUmbracoForm<UmbProfileController>("HandleUpdateProfile"))
     {
         <fieldset>
             <legend>Edit profile</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
index be4e04eeae..1e2bb759cb 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
@@ -18,7 +18,7 @@
 
 @Html.RenderJsHere()
 
-@using (Html.BeginUmbracoForm<LoginController>("HandleLogin"))
+@using (Html.BeginUmbracoForm<UmbLoginController>("HandleLogin"))
 {
     <fieldset>
         <legend>Login</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
index 4f9b30d9c0..f0d62be7b6 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml
@@ -21,7 +21,7 @@
 {
     <p>You are currently logged in as @loginStatusModel.Name</p>
 
-    using (Html.BeginUmbracoForm<LoginStatusController>("HandleLogout"))
+    using (Html.BeginUmbracoForm<UmbLoginStatusController>("HandleLogout"))
     {
          <fieldset>
              <legend>Logout</legend>
diff --git a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
index b0a7cbcf7f..9a18684f13 100644
--- a/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
@@ -45,7 +45,7 @@
 } 
 else 
 {   
-    using (Html.BeginUmbracoForm<RegisterController>("HandleRegisterMember"))
+    using (Html.BeginUmbracoForm<UmbRegisterController>("HandleRegisterMember"))
     {
         <fieldset>
             <legend>Register Member</legend>
diff --git a/src/Umbraco.Web/Controllers/LoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs
similarity index 95%
rename from src/Umbraco.Web/Controllers/LoginController.cs
rename to src/Umbraco.Web/Controllers/UmbLoginController.cs
index 67097ee60a..d654c1e737 100644
--- a/src/Umbraco.Web/Controllers/LoginController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs
@@ -7,7 +7,7 @@ using Umbraco.Web.Mvc;
 
 namespace Umbraco.Web.Controllers
 {
-    public class LoginController : SurfaceController
+    public class UmbLoginController : SurfaceController
     {
         [HttpPost]
         public ActionResult HandleLogin([Bind(Prefix="loginModel")]LoginModel model)
diff --git a/src/Umbraco.Web/Controllers/LoginStatusController.cs b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
similarity index 92%
rename from src/Umbraco.Web/Controllers/LoginStatusController.cs
rename to src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
index 41a68475b2..0c32eb4ddc 100644
--- a/src/Umbraco.Web/Controllers/LoginStatusController.cs
+++ b/src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
@@ -7,7 +7,7 @@ using Umbraco.Web.Mvc;
 
 namespace Umbraco.Web.Controllers
 {
-    public class LoginStatusController : SurfaceController
+    public class UmbLoginStatusController : SurfaceController
     {
         [HttpPost]
         public ActionResult HandleLogout([Bind(Prefix = "loginStatusModel")]LoginStatusModel model)
diff --git a/src/Umbraco.Web/Controllers/ProfileController.cs b/src/Umbraco.Web/Controllers/UmbProfileController.cs
similarity index 92%
rename from src/Umbraco.Web/Controllers/ProfileController.cs
rename to src/Umbraco.Web/Controllers/UmbProfileController.cs
index 484f24beee..ef1891832d 100644
--- a/src/Umbraco.Web/Controllers/ProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -10,14 +10,14 @@ using Umbraco.Core.Security;
 
 namespace Umbraco.Web.Controllers
 {
-    public class ProfileController : SurfaceController
+    public class UmbProfileController : SurfaceController
     {
         [HttpPost]
         public ActionResult HandleUpdateProfile([Bind(Prefix = "profileModel")] ProfileModel model)
         {
             if (Membership.Provider.IsUmbracoMembershipProvider() == false)
             {
-                throw new NotSupportedException("Profile editing with the " + typeof (ProfileController) + " is not supported when not using the default Umbraco membership provider");
+                throw new NotSupportedException("Profile editing with the " + typeof(UmbProfileController) + " is not supported when not using the default Umbraco membership provider");
             }
 
             if (ModelState.IsValid == false)
diff --git a/src/Umbraco.Web/Controllers/RegisterController.cs b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
similarity index 98%
rename from src/Umbraco.Web/Controllers/RegisterController.cs
rename to src/Umbraco.Web/Controllers/UmbRegisterController.cs
index 0f5060718c..7f943435c2 100644
--- a/src/Umbraco.Web/Controllers/RegisterController.cs
+++ b/src/Umbraco.Web/Controllers/UmbRegisterController.cs
@@ -9,7 +9,7 @@ using Umbraco.Web.Mvc;
 
 namespace Umbraco.Web.Controllers
 {
-    public class RegisterController : SurfaceController
+    public class UmbRegisterController : SurfaceController
     {
         [HttpPost]
         public ActionResult HandleRegisterMember([Bind(Prefix = "registerModel")]RegisterModel model)
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 9295a21996..aa21df2684 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -291,8 +291,8 @@
     <Compile Include="Cache\UserPermissionsCacheRefresher.cs" />
     <Compile Include="Cache\UserTypeCacheRefresher.cs" />
     <Compile Include="Configuration\WebRouting.cs" />
-    <Compile Include="Controllers\ProfileController.cs" />
-    <Compile Include="Controllers\LoginStatusController.cs" />
+    <Compile Include="Controllers\UmbProfileController.cs" />
+    <Compile Include="Controllers\UmbLoginStatusController.cs" />
     <Compile Include="Editors\MediaController.cs" />
     <Compile Include="Models\ChangingPasswordModel.cs" />
     <Compile Include="Models\IRenderModel.cs" />
@@ -301,7 +301,7 @@
     <Compile Include="Mvc\UmbracoTemplatePageOfTContent.cs" />
     <Compile Include="Mvc\UmbracoViewPage.cs" />
     <Compile Include="Models\ContentEditing\ContentSortOrder.cs" />
-    <Compile Include="Controllers\RegisterController.cs" />
+    <Compile Include="Controllers\UmbRegisterController.cs" />
     <Compile Include="Models\PasswordChangedModel.cs" />
     <Compile Include="Models\ProfileModel.cs" />
     <Compile Include="Models\LoginStatusModel.cs" />
@@ -454,7 +454,7 @@
     <Compile Include="umbraco.presentation\umbraco\settings\stylesheet\property\EditStyleSheetProperty.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Controllers\LoginController.cs" />
+    <Compile Include="Controllers\UmbLoginController.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\TranslateTreeNames.cs" />
     <Compile Include="UrlHelperExtensions.cs" />
     <Compile Include="UrlHelperRenderExtensions.cs" />