diff --git a/src/Umbraco.Core/Security/UmbracoMembersMembershipProviderBase.cs b/src/Umbraco.Core/Security/UmbracoMembersMembershipProviderBase.cs
index ce56c2708e..fc07abc896 100644
--- a/src/Umbraco.Core/Security/UmbracoMembersMembershipProviderBase.cs
+++ b/src/Umbraco.Core/Security/UmbracoMembersMembershipProviderBase.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Security
     /// An interface for exposing the content type properties for storing membership data in when
     /// a membership provider's data is backed by an Umbraco content type. 
     /// </summary>
-    public interface IUmbracoContentTypeMembershipProvider
+    public interface IUmbracoMemberTypeMembershipProvider
     {
 
         string LockPropertyTypeAlias { get;  }
diff --git a/src/Umbraco.Core/Services/IMembershipMemberService.cs b/src/Umbraco.Core/Services/IMembershipMemberService.cs
index 807b250ea7..35c996f51a 100644
--- a/src/Umbraco.Core/Services/IMembershipMemberService.cs
+++ b/src/Umbraco.Core/Services/IMembershipMemberService.cs
@@ -48,7 +48,7 @@ namespace Umbraco.Core.Services
         /// <param name="memberTypeAlias"></param>
         /// <param name="raiseEvents"></param>
         /// <returns></returns>
-        T CreateMemberWithIdentity(string username, string email, string password, string memberTypeAlias, bool raiseEvents = true);
+        T CreateWithIdentity(string username, string email, string password, string memberTypeAlias, bool raiseEvents = true);
 
         /// <summary>
         /// Gets the member by the provider key
@@ -68,19 +68,19 @@ namespace Umbraco.Core.Services
 
         void Delete(T membershipUser);
 
-        void Save(T membershipUser, bool raiseEvents = true);
+        void Save(T entity, bool raiseEvents = true);
 
-        void Save(IEnumerable<T> members, bool raiseEvents = true);
+        void Save(IEnumerable<T> entities, bool raiseEvents = true);
 
-        IEnumerable<T> FindMembersByEmail(string emailStringToMatch, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
+        IEnumerable<T> FindByEmail(string emailStringToMatch, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
 
-        IEnumerable<T> FindMembersByUsername(string login, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
+        IEnumerable<T> FindByUsername(string login, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
 
         /// <summary>
         /// Gets the total number of members based on the count type
         /// </summary>
         /// <returns></returns>
-        int GetMemberCount(MemberCountType countType);
+        int GetCount(MemberCountType countType);
 
         /// <summary>
         /// Gets a list of paged member data
@@ -89,6 +89,6 @@ namespace Umbraco.Core.Services
         /// <param name="pageSize"></param>
         /// <param name="totalRecords"></param>
         /// <returns></returns>
-        IEnumerable<T> GetAllMembers(int pageIndex, int pageSize, out int totalRecords);
+        IEnumerable<T> GetAll(int pageIndex, int pageSize, out int totalRecords);
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Services/MemberService.cs b/src/Umbraco.Core/Services/MemberService.cs
index f7cccd798e..e0c325e31c 100644
--- a/src/Umbraco.Core/Services/MemberService.cs
+++ b/src/Umbraco.Core/Services/MemberService.cs
@@ -252,7 +252,7 @@ namespace Umbraco.Core.Services
         /// <param name="pageIndex"></param>
         /// <param name="pageSize"></param>
         /// <returns></returns>
-        public IEnumerable<IMember> FindMembersByEmail(string emailStringToMatch, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
+        public IEnumerable<IMember> FindByEmail(string emailStringToMatch, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
         {
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateMemberRepository(uow))
@@ -284,7 +284,7 @@ namespace Umbraco.Core.Services
             }
         }
 
-        public IEnumerable<IMember> FindMembersByUsername(string login, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
+        public IEnumerable<IMember> FindByUsername(string login, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
         {
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateMemberRepository(uow))
@@ -525,7 +525,7 @@ namespace Umbraco.Core.Services
         /// that have their last active date within the Membership.UserIsOnlineTimeWindow (which is in minutes). It isn't exact science
         /// but that is how MS have made theirs so we'll follow that principal.
         /// </remarks>
-        public int GetMemberCount(MemberCountType countType)
+        public int GetCount(MemberCountType countType)
         {
             using (var repository = _repositoryFactory.CreateMemberRepository(_uowProvider.GetUnitOfWork()))
             {
@@ -565,7 +565,7 @@ namespace Umbraco.Core.Services
 
         }
 
-        public IEnumerable<IMember> GetAllMembers(int pageIndex, int pageSize, out int totalRecords)
+        public IEnumerable<IMember> GetAll(int pageIndex, int pageSize, out int totalRecords)
         {
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateMemberRepository(uow))
@@ -615,7 +615,7 @@ namespace Umbraco.Core.Services
         /// <param name="memberTypeAlias"></param>
         /// <param name="raiseEvents"></param>
         /// <returns></returns>
-        public IMember CreateMemberWithIdentity(string username, string email, string password, string memberTypeAlias, bool raiseEvents = true)
+        public IMember CreateWithIdentity(string username, string email, string password, string memberTypeAlias, bool raiseEvents = true)
         {
             var uow = _uowProvider.GetUnitOfWork();
             IMemberType memberType;
@@ -712,13 +712,13 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Saves an updated Member
         /// </summary>
-        /// <param name="member"></param>
+        /// <param name="entity"></param>
         /// <param name="raiseEvents"></param>
-        public void Save(IMember member, bool raiseEvents = true)
+        public void Save(IMember entity, bool raiseEvents = true)
         {
             if (raiseEvents)
             {
-                if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IMember>(member), this))
+                if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IMember>(entity), this))
                 {
                     return;
                 }
@@ -728,22 +728,22 @@ namespace Umbraco.Core.Services
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateMemberRepository(uow))
             {
-                repository.AddOrUpdate(member);
+                repository.AddOrUpdate(entity);
                 uow.Commit();
 
-                var xml = member.ToXml();
-                CreateAndSaveMemberXml(xml, member.Id, uow.Database);
+                var xml = entity.ToXml();
+                CreateAndSaveMemberXml(xml, entity.Id, uow.Database);
             }
 
             if (raiseEvents)
-                Saved.RaiseEvent(new SaveEventArgs<IMember>(member, false), this);
+                Saved.RaiseEvent(new SaveEventArgs<IMember>(entity, false), this);
         }
 
-        public void Save(IEnumerable<IMember> members, bool raiseEvents = true)
+        public void Save(IEnumerable<IMember> entities, bool raiseEvents = true)
         {
             if (raiseEvents)
             {
-                if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IMember>(members), this))
+                if (Saving.IsRaisedEventCancelled(new SaveEventArgs<IMember>(entities), this))
                     return;
             }
             using (new WriteLock(Locker))
@@ -751,7 +751,7 @@ namespace Umbraco.Core.Services
                 var uow = _uowProvider.GetUnitOfWork();
                 using (var repository = _repositoryFactory.CreateMemberRepository(uow))
                 {
-                    foreach (var member in members)
+                    foreach (var member in entities)
                     {
                         repository.AddOrUpdate(member);
                     }
@@ -759,14 +759,14 @@ namespace Umbraco.Core.Services
                     //commit the whole lot in one go
                     uow.Commit();
 
-                    foreach (var member in members)
+                    foreach (var member in entities)
                     {
                         CreateAndSaveMemberXml(member.ToXml(), member.Id, uow.Database);
                     }
                 }
 
                 if (raiseEvents)
-                    Saved.RaiseEvent(new SaveEventArgs<IMember>(members, false), this);
+                    Saved.RaiseEvent(new SaveEventArgs<IMember>(entities, false), this);
             }
         }
 
diff --git a/src/Umbraco.Core/Services/NotificationService.cs b/src/Umbraco.Core/Services/NotificationService.cs
index aa345266be..ba42548bac 100644
--- a/src/Umbraco.Core/Services/NotificationService.cs
+++ b/src/Umbraco.Core/Services/NotificationService.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Services
             IContent[] allVersions = null;
 
             int totalUsers;
-            var allUsers = _userService.GetAllMembers(0, int.MaxValue, out totalUsers);
+            var allUsers = _userService.GetAll(0, int.MaxValue, out totalUsers);
             foreach (var u in allUsers)
             {
                 if (u.IsApproved == false) continue;
diff --git a/src/Umbraco.Core/Services/UserService.cs b/src/Umbraco.Core/Services/UserService.cs
index 793b667c1d..db0d20ed50 100644
--- a/src/Umbraco.Core/Services/UserService.cs
+++ b/src/Umbraco.Core/Services/UserService.cs
@@ -119,7 +119,7 @@ namespace Umbraco.Core.Services
             }
         }
 
-        public IUser CreateMemberWithIdentity(string username, string email, string password, string memberTypeAlias, bool raiseEvents = true)
+        public IUser CreateWithIdentity(string username, string email, string password, string memberTypeAlias, bool raiseEvents = true)
         {
             var userType = GetUserTypeByAlias(memberTypeAlias);
             if (userType == null)
@@ -218,37 +218,37 @@ namespace Umbraco.Core.Services
             }
         }
 
-        public void Save(IUser membershipUser, bool raiseEvents = true)
+        public void Save(IUser entity, bool raiseEvents = true)
         {
             if (raiseEvents)
             {
-                if (SavingUser.IsRaisedEventCancelled(new SaveEventArgs<IUser>(membershipUser), this))
+                if (SavingUser.IsRaisedEventCancelled(new SaveEventArgs<IUser>(entity), this))
                     return;
             }
 
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateUserRepository(uow))
             {
-                repository.AddOrUpdate(membershipUser);
+                repository.AddOrUpdate(entity);
                 uow.Commit();
             }
 
             if (raiseEvents)
-                SavedUser.RaiseEvent(new SaveEventArgs<IUser>(membershipUser, false), this);
+                SavedUser.RaiseEvent(new SaveEventArgs<IUser>(entity, false), this);
         }
 
-        public void Save(IEnumerable<IUser> members, bool raiseEvents = true)
+        public void Save(IEnumerable<IUser> entities, bool raiseEvents = true)
         {
             if (raiseEvents)
             {
-                if (SavingUser.IsRaisedEventCancelled(new SaveEventArgs<IUser>(members), this))
+                if (SavingUser.IsRaisedEventCancelled(new SaveEventArgs<IUser>(entities), this))
                     return;
             }
 
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateUserRepository(uow))
             {
-                foreach (var member in members)
+                foreach (var member in entities)
                 {
                     repository.AddOrUpdate(member);                 
                 }
@@ -257,10 +257,10 @@ namespace Umbraco.Core.Services
             }
 
             if (raiseEvents)
-                SavedUser.RaiseEvent(new SaveEventArgs<IUser>(members, false), this);
+                SavedUser.RaiseEvent(new SaveEventArgs<IUser>(entities, false), this);
         }
 
-        public IEnumerable<IUser> FindMembersByEmail(string emailStringToMatch, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
+        public IEnumerable<IUser> FindByEmail(string emailStringToMatch, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
         {
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateUserRepository(uow))
@@ -292,7 +292,7 @@ namespace Umbraco.Core.Services
             }
         }
 
-        public IEnumerable<IUser> FindMembersByUsername(string login, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
+        public IEnumerable<IUser> FindByUsername(string login, int pageIndex, int pageSize, out int totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith)
         {
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateUserRepository(uow))
@@ -324,7 +324,7 @@ namespace Umbraco.Core.Services
             }
         }
 
-        public int GetMemberCount(MemberCountType countType)
+        public int GetCount(MemberCountType countType)
         {
             using (var repository = _repositoryFactory.CreateUserRepository(_uowProvider.GetUnitOfWork()))
             {
@@ -360,7 +360,7 @@ namespace Umbraco.Core.Services
             }
         }
 
-        public IEnumerable<IUser> GetAllMembers(int pageIndex, int pageSize, out int totalRecords)
+        public IEnumerable<IUser> GetAll(int pageIndex, int pageSize, out int totalRecords)
         {
             var uow = _uowProvider.GetUnitOfWork();
             using (var repository = _repositoryFactory.CreateUserRepository(uow))
diff --git a/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs b/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
index b39bdeeab2..0053dc758e 100644
--- a/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
+++ b/src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
@@ -94,7 +94,7 @@ namespace Umbraco.Tests.Membership
             mServiceMock.Setup(service => service.GetByEmail("test@test.com")).Returns(() => null);
             mServiceMock.Setup(service => service.GetDefaultMemberType()).Returns("Member");
             mServiceMock.Setup(
-                service => service.CreateMemberWithIdentity(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
+                service => service.CreateWithIdentity(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
                         .Callback((string u, string e, string p, string m, bool b) =>
                             {
                                 createdMember = new Member("test", e, u, p, memberType);
@@ -125,7 +125,7 @@ namespace Umbraco.Tests.Membership
             mServiceMock.Setup(service => service.GetByEmail("test@test.com")).Returns(() => null);
             mServiceMock.Setup(service => service.GetDefaultMemberType()).Returns("Member");
             mServiceMock.Setup(
-                service => service.CreateMemberWithIdentity(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
+                service => service.CreateWithIdentity(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
                         .Callback((string u, string e, string p, string m, bool b) =>
                             {
                                 createdMember = new Member("test", e, u, p, memberType);
@@ -158,7 +158,7 @@ namespace Umbraco.Tests.Membership
             mServiceMock.Setup(service => service.GetByEmail("test@test.com")).Returns(() => null);
             mServiceMock.Setup(service => service.GetDefaultMemberType()).Returns("Member");
             mServiceMock.Setup(
-                service => service.CreateMemberWithIdentity(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
+                service => service.CreateWithIdentity(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()))
                         .Callback((string u, string e, string p, string m, bool b) =>
                         {
                             createdMember = new Member("test", e, u, p, memberType);
diff --git a/src/Umbraco.Tests/Services/MemberServiceTests.cs b/src/Umbraco.Tests/Services/MemberServiceTests.cs
index 380f050224..527a7b9801 100644
--- a/src/Umbraco.Tests/Services/MemberServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberServiceTests.cs
@@ -381,7 +381,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.MemberService.Save(members);
 
             int totalRecs;
-            var found = ServiceContext.MemberService.GetAllMembers(0, 2, out totalRecs);
+            var found = ServiceContext.MemberService.GetAll(0, 2, out totalRecs);
 
             Assert.AreEqual(2, found.Count());
             Assert.AreEqual(10, totalRecs);
@@ -401,7 +401,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.MemberService.Save(customMember);
 
             int totalRecs;
-            var found = ServiceContext.MemberService.FindMembersByEmail("tes", 0, 100, out totalRecs, StringPropertyMatchType.StartsWith);
+            var found = ServiceContext.MemberService.FindByEmail("tes", 0, 100, out totalRecs, StringPropertyMatchType.StartsWith);
 
             Assert.AreEqual(10, found.Count());
         }
@@ -418,7 +418,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.MemberService.Save(customMember);
 
             int totalRecs;
-            var found = ServiceContext.MemberService.FindMembersByEmail("test.com", 0, 100, out totalRecs, StringPropertyMatchType.EndsWith);
+            var found = ServiceContext.MemberService.FindByEmail("test.com", 0, 100, out totalRecs, StringPropertyMatchType.EndsWith);
 
             Assert.AreEqual(11, found.Count());
         }
@@ -435,7 +435,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.MemberService.Save(customMember);
 
             int totalRecs;
-            var found = ServiceContext.MemberService.FindMembersByEmail("test", 0, 100, out totalRecs, StringPropertyMatchType.Contains);
+            var found = ServiceContext.MemberService.FindByEmail("test", 0, 100, out totalRecs, StringPropertyMatchType.Contains);
 
             Assert.AreEqual(11, found.Count());
         }
@@ -452,7 +452,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.MemberService.Save(customMember);
 
             int totalRecs;
-            var found = ServiceContext.MemberService.FindMembersByEmail("hello@test.com", 0, 100, out totalRecs, StringPropertyMatchType.Exact);
+            var found = ServiceContext.MemberService.FindByEmail("hello@test.com", 0, 100, out totalRecs, StringPropertyMatchType.Exact);
 
             Assert.AreEqual(1, found.Count());
         }
@@ -469,7 +469,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.MemberService.Save(customMember);
 
             int totalRecs;
-            var found = ServiceContext.MemberService.FindMembersByUsername("tes", 0, 100, out totalRecs, StringPropertyMatchType.StartsWith);
+            var found = ServiceContext.MemberService.FindByUsername("tes", 0, 100, out totalRecs, StringPropertyMatchType.StartsWith);
 
             Assert.AreEqual(10, found.Count());
         }
@@ -486,7 +486,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.MemberService.Save(customMember);
 
             int totalRecs;
-            var found = ServiceContext.MemberService.FindMembersByUsername("llo", 0, 100, out totalRecs, StringPropertyMatchType.EndsWith);
+            var found = ServiceContext.MemberService.FindByUsername("llo", 0, 100, out totalRecs, StringPropertyMatchType.EndsWith);
 
             Assert.AreEqual(1, found.Count());
         }
@@ -503,7 +503,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.MemberService.Save(customMember);
 
             int totalRecs;
-            var found = ServiceContext.MemberService.FindMembersByUsername("test", 0, 100, out totalRecs, StringPropertyMatchType.Contains);
+            var found = ServiceContext.MemberService.FindByUsername("test", 0, 100, out totalRecs, StringPropertyMatchType.Contains);
 
             Assert.AreEqual(11, found.Count());
         }
@@ -520,7 +520,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.MemberService.Save(customMember);
 
             int totalRecs;
-            var found = ServiceContext.MemberService.FindMembersByUsername("hello", 0, 100, out totalRecs, StringPropertyMatchType.Exact);
+            var found = ServiceContext.MemberService.FindByUsername("hello", 0, 100, out totalRecs, StringPropertyMatchType.Exact);
 
             Assert.AreEqual(1, found.Count());
         }
@@ -850,7 +850,7 @@ namespace Umbraco.Tests.Services
             var customMember = MockedMember.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
             ServiceContext.MemberService.Save(customMember);
 
-            var found = ServiceContext.MemberService.GetMemberCount(MemberCountType.All);
+            var found = ServiceContext.MemberService.GetCount(MemberCountType.All);
 
             Assert.AreEqual(11, found);
         }
@@ -867,7 +867,7 @@ namespace Umbraco.Tests.Services
             customMember.SetValue(Constants.Conventions.Member.LastLoginDate, DateTime.Now);
             ServiceContext.MemberService.Save(customMember);
 
-            var found = ServiceContext.MemberService.GetMemberCount(MemberCountType.Online);
+            var found = ServiceContext.MemberService.GetCount(MemberCountType.Online);
 
             Assert.AreEqual(9, found);
         }
@@ -884,7 +884,7 @@ namespace Umbraco.Tests.Services
             customMember.SetValue(Constants.Conventions.Member.IsLockedOut, true);
             ServiceContext.MemberService.Save(customMember);
 
-            var found = ServiceContext.MemberService.GetMemberCount(MemberCountType.LockedOut);
+            var found = ServiceContext.MemberService.GetCount(MemberCountType.LockedOut);
 
             Assert.AreEqual(6, found);
         }
@@ -901,7 +901,7 @@ namespace Umbraco.Tests.Services
             customMember.SetValue(Constants.Conventions.Member.IsApproved, false);
             ServiceContext.MemberService.Save(customMember);
 
-            var found = ServiceContext.MemberService.GetMemberCount(MemberCountType.Approved);
+            var found = ServiceContext.MemberService.GetCount(MemberCountType.Approved);
 
             Assert.AreEqual(5, found);
         }
diff --git a/src/Umbraco.Tests/Services/UserServiceTests.cs b/src/Umbraco.Tests/Services/UserServiceTests.cs
index ac2120edea..224d3d335b 100644
--- a/src/Umbraco.Tests/Services/UserServiceTests.cs
+++ b/src/Umbraco.Tests/Services/UserServiceTests.cs
@@ -188,7 +188,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.UserService.Save(customUser);
 
             int totalRecs;
-            var found = ServiceContext.UserService.FindMembersByEmail("tes", 0, 100, out totalRecs, StringPropertyMatchType.StartsWith);
+            var found = ServiceContext.UserService.FindByEmail("tes", 0, 100, out totalRecs, StringPropertyMatchType.StartsWith);
 
             Assert.AreEqual(10, found.Count());
         }
@@ -206,7 +206,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.UserService.Save(customUser);
 
             int totalRecs;
-            var found = ServiceContext.UserService.FindMembersByEmail("test.com", 0, 100, out totalRecs, StringPropertyMatchType.EndsWith);
+            var found = ServiceContext.UserService.FindByEmail("test.com", 0, 100, out totalRecs, StringPropertyMatchType.EndsWith);
 
             Assert.AreEqual(11, found.Count());
         }
@@ -224,7 +224,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.UserService.Save(customUser);
 
             int totalRecs;
-            var found = ServiceContext.UserService.FindMembersByEmail("test", 0, 100, out totalRecs, StringPropertyMatchType.Contains);
+            var found = ServiceContext.UserService.FindByEmail("test", 0, 100, out totalRecs, StringPropertyMatchType.Contains);
 
             Assert.AreEqual(11, found.Count());
         }
@@ -242,7 +242,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.UserService.Save(customUser);
 
             int totalRecs;
-            var found = ServiceContext.UserService.FindMembersByEmail("hello@test.com", 0, 100, out totalRecs, StringPropertyMatchType.Exact);
+            var found = ServiceContext.UserService.FindByEmail("hello@test.com", 0, 100, out totalRecs, StringPropertyMatchType.Exact);
 
             Assert.AreEqual(1, found.Count());
         }
@@ -256,7 +256,7 @@ namespace Umbraco.Tests.Services
             ServiceContext.UserService.Save(users);
 
             int totalRecs;
-            var found = ServiceContext.UserService.GetAllMembers(0, 2, out totalRecs);
+            var found = ServiceContext.UserService.GetAll(0, 2, out totalRecs);
 
             Assert.AreEqual(2, found.Count());
             // + 1 because of the built in admin user
@@ -275,7 +275,7 @@ namespace Umbraco.Tests.Services
             var customUser = MockedUser.CreateUser(userType);
             ServiceContext.UserService.Save(customUser);
 
-            var found = ServiceContext.UserService.GetMemberCount(MemberCountType.All);
+            var found = ServiceContext.UserService.GetCount(MemberCountType.All);
 
             // + 1 because of the built in admin user
             Assert.AreEqual(12, found);
@@ -306,7 +306,7 @@ namespace Umbraco.Tests.Services
             customUser.IsLockedOut = true;
             ServiceContext.UserService.Save(customUser);
 
-            var found = ServiceContext.UserService.GetMemberCount(MemberCountType.LockedOut);
+            var found = ServiceContext.UserService.GetCount(MemberCountType.LockedOut);
 
             Assert.AreEqual(6, found);
         }
@@ -323,7 +323,7 @@ namespace Umbraco.Tests.Services
             customUser.IsApproved = false;
             ServiceContext.UserService.Save(customUser);
 
-            var found = ServiceContext.UserService.GetMemberCount(MemberCountType.Approved);
+            var found = ServiceContext.UserService.GetCount(MemberCountType.Approved);
 
             // + 1 because of the built in admin user
             Assert.AreEqual(6, found);
diff --git a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
index 0fc70a2ce4..1dc88b4b51 100644
--- a/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.Security.Providers
     /// <summary>
     /// Custom Membership Provider for Umbraco Members (User authentication for Frontend applications NOT umbraco CMS)  
     /// </summary>
-    public class MembersMembershipProvider : UmbracoServiceMembershipProvider<IMembershipMemberService, IMember>, IUmbracoContentTypeMembershipProvider
+    public class MembersMembershipProvider : UmbracoMembershipProvider<IMembershipMemberService, IMember>, IUmbracoMemberTypeMembershipProvider
     {
         public MembersMembershipProvider()
             : this(ApplicationContext.Current.Services.MemberService)
diff --git a/src/Umbraco.Web/Security/Providers/UmbracoServiceMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
similarity index 93%
rename from src/Umbraco.Web/Security/Providers/UmbracoServiceMembershipProvider.cs
rename to src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
index 84bd8dc65b..6b6e3e96fa 100644
--- a/src/Umbraco.Web/Security/Providers/UmbracoServiceMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
@@ -19,14 +19,14 @@ namespace Umbraco.Web.Security.Providers
     /// <summary>
     /// Abstract Membership Provider that users any implementation of IMembershipMemberService{TEntity} service
     /// </summary>
-    public abstract class UmbracoServiceMembershipProvider<T, TEntity> : UmbracoMembershipProviderBase
+    public abstract class UmbracoMembershipProvider<T, TEntity> : UmbracoMembershipProviderBase
         where T : IMembershipMemberService<TEntity>
         where TEntity : class, IMembershipUser
     {
 
         protected IMembershipMemberService<TEntity> MemberService { get; private set; }
         
-        protected UmbracoServiceMembershipProvider(IMembershipMemberService<TEntity> memberService)
+        protected UmbracoMembershipProvider(IMembershipMemberService<TEntity> memberService)
         {
             MemberService = memberService;
         }
@@ -134,7 +134,7 @@ namespace Umbraco.Web.Security.Providers
             if (MemberService.Exists(username))
             {
                 status = MembershipCreateStatus.DuplicateUserName;
-                LogHelper.Warn<UmbracoServiceMembershipProvider<T, TEntity>>("Cannot create member as username already exists: " + username);
+                LogHelper.Warn<UmbracoMembershipProvider<T, TEntity>>("Cannot create member as username already exists: " + username);
                 return null;
             }
 
@@ -142,7 +142,7 @@ namespace Umbraco.Web.Security.Providers
             if (MemberService.GetByEmail(email) != null && RequiresUniqueEmail)
             {
                 status = MembershipCreateStatus.DuplicateEmail;
-                LogHelper.Warn<UmbracoServiceMembershipProvider<T, TEntity>>(
+                LogHelper.Warn<UmbracoMembershipProvider<T, TEntity>>(
                     "Cannot create member as a member with the same email address exists: " + email);
                 return null;
             }
@@ -150,7 +150,7 @@ namespace Umbraco.Web.Security.Providers
             string salt;
             var encodedPassword = EncryptOrHashNewPassword(password, out salt);
 
-            var member = MemberService.CreateMemberWithIdentity(
+            var member = MemberService.CreateWithIdentity(
                 username,
                 email, 
                 FormatPasswordForStorage(encodedPassword, salt), 
@@ -199,7 +199,7 @@ namespace Umbraco.Web.Security.Providers
         /// </returns>
         public override MembershipUserCollection FindUsersByEmail(string emailToMatch, int pageIndex, int pageSize, out int totalRecords)
         {
-            var byEmail = MemberService.FindMembersByEmail(emailToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
+            var byEmail = MemberService.FindByEmail(emailToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
             
             var collection = new MembershipUserCollection();
             foreach (var m in byEmail)
@@ -221,7 +221,7 @@ namespace Umbraco.Web.Security.Providers
         /// </returns>
         public override MembershipUserCollection FindUsersByName(string usernameToMatch, int pageIndex, int pageSize, out int totalRecords)
         {
-            var byEmail = MemberService.FindMembersByUsername(usernameToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
+            var byEmail = MemberService.FindByUsername(usernameToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
 
             var collection = new MembershipUserCollection();
             foreach (var m in byEmail)
@@ -244,7 +244,7 @@ namespace Umbraco.Web.Security.Providers
         {
             var membersList = new MembershipUserCollection();
 
-            var pagedMembers = MemberService.GetAllMembers(pageIndex, pageSize, out totalRecords);
+            var pagedMembers = MemberService.GetAll(pageIndex, pageSize, out totalRecords);
             
             foreach (var m in pagedMembers)
             {
@@ -266,7 +266,7 @@ namespace Umbraco.Web.Security.Providers
         /// </remarks>
         public override int GetNumberOfUsersOnline()
         {
-            return MemberService.GetMemberCount(MemberCountType.Online);
+            return MemberService.GetCount(MemberCountType.Online);
         }
 
         /// <summary>
@@ -463,7 +463,7 @@ namespace Umbraco.Web.Security.Providers
             if (RequiresUniqueEmail && user.Email.Trim().IsNullOrWhiteSpace() == false)
             {
                 int totalRecs;
-                var byEmail = MemberService.FindMembersByEmail(user.Email.Trim(), 0, int.MaxValue, out totalRecs, StringPropertyMatchType.Exact);
+                var byEmail = MemberService.FindByEmail(user.Email.Trim(), 0, int.MaxValue, out totalRecs, StringPropertyMatchType.Exact);
                 if (byEmail.Count(x => x.Id != m.Id) > 0)
                 {
                     throw new ProviderException(string.Format("A member with the email '{0}' already exists", user.Email));
@@ -498,12 +498,12 @@ namespace Umbraco.Web.Security.Providers
 
             if (member.IsApproved == false)
             {
-                LogHelper.Info<UmbracoServiceMembershipProvider<T, TEntity>>("Cannot validate member " + username + " because they are not approved");
+                LogHelper.Info<UmbracoMembershipProvider<T, TEntity>>("Cannot validate member " + username + " because they are not approved");
                 return false;
             }
             if (member.IsLockedOut)
             {
-                LogHelper.Info<UmbracoServiceMembershipProvider<T, TEntity>>("Cannot validate member " + username + " because they are currently locked out");
+                LogHelper.Info<UmbracoMembershipProvider<T, TEntity>>("Cannot validate member " + username + " because they are currently locked out");
                 return false;
             }
 
@@ -521,7 +521,7 @@ namespace Umbraco.Web.Security.Providers
                 {
                     member.IsLockedOut = true;
                     member.LastLockoutDate = DateTime.Now;
-                    LogHelper.Info<UmbracoServiceMembershipProvider<T, TEntity>>("Member " + username + " is now locked out, max invalid password attempts exceeded");
+                    LogHelper.Info<UmbracoMembershipProvider<T, TEntity>>("Member " + username + " is now locked out, max invalid password attempts exceeded");
                 }
             }
             else
diff --git a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
index e3ede8f6d8..2dbce6a350 100644
--- a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
+++ b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Web.Security.Providers
     /// <summary>
     /// Custom Membership Provider for Umbraco Users (User authentication for Umbraco Backend CMS)  
     /// </summary>
-    public class UsersMembershipProvider : UmbracoServiceMembershipProvider<IMembershipUserService, IUser>, IUsersMembershipProvider
+    public class UsersMembershipProvider : UmbracoMembershipProvider<IMembershipUserService, IUser>, IUsersMembershipProvider
     {
         
         public UsersMembershipProvider()
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index a3081cdb8d..944d51536a 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -319,7 +319,7 @@
     <Compile Include="Security\MembershipHelper.cs" />
     <Compile Include="Security\Providers\MembersMembershipProvider.cs" />
     <Compile Include="Security\Providers\MembersRoleProvider.cs" />
-    <Compile Include="Security\Providers\UmbracoServiceMembershipProvider.cs" />
+    <Compile Include="Security\Providers\UmbracoMembershipProvider.cs" />
     <Compile Include="Security\Providers\UsersMembershipProvider.cs" />
     <Compile Include="Standalone\ServiceContextManager.cs" />
     <Compile Include="Standalone\StandaloneApplication.cs" />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
index 4151c3cecd..148b6bc861 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
@@ -360,7 +360,7 @@ namespace umbraco.cms.presentation.members
                         tp.ErrorControl.Visible = false;
                     }
 
-                    var memberTypeProvider = (IUmbracoContentTypeMembershipProvider) Membership.Provider;
+                    var memberTypeProvider = (IUmbracoMemberTypeMembershipProvider) Membership.Provider;
                     
                     //update the membership provider                    
                     var commentsProp = _contentControl.DataTypes.GetValue(memberTypeProvider.CommentPropertyTypeAlias);
diff --git a/src/umbraco.businesslogic/User.cs b/src/umbraco.businesslogic/User.cs
index 89ce9324f5..f0ebb4590d 100644
--- a/src/umbraco.businesslogic/User.cs
+++ b/src/umbraco.businesslogic/User.cs
@@ -341,7 +341,7 @@ namespace umbraco.BusinessLogic
         public static User[] getAll()
         {
             int totalRecs;
-            var users = ApplicationContext.Current.Services.UserService.GetAllMembers(
+            var users = ApplicationContext.Current.Services.UserService.GetAll(
                 0, int.MaxValue, out totalRecs);
 
             return users.Select(x => new User(x))
@@ -390,14 +390,14 @@ namespace umbraco.BusinessLogic
             int totalRecs;
             if (useExactMatch)
             {
-                return ApplicationContext.Current.Services.UserService.FindMembersByEmail(
+                return ApplicationContext.Current.Services.UserService.FindByEmail(
                     email, 0, int.MaxValue, out totalRecs, StringPropertyMatchType.Exact)
                     .Select(x => new User(x))
                     .ToArray();
             }
             else
             {
-                return ApplicationContext.Current.Services.UserService.FindMembersByEmail(
+                return ApplicationContext.Current.Services.UserService.FindByEmail(
                     string.Format("%{0}%", email), 0, int.MaxValue, out totalRecs, StringPropertyMatchType.Wildcard)
                     .Select(x => new User(x))
                     .ToArray();
@@ -430,14 +430,14 @@ namespace umbraco.BusinessLogic
             int totalRecs;
             if (partialMatch)
             {
-                return ApplicationContext.Current.Services.UserService.FindMembersByUsername(
+                return ApplicationContext.Current.Services.UserService.FindByUsername(
                     string.Format("%{0}%", login), 0, int.MaxValue, out totalRecs, StringPropertyMatchType.Wildcard)
                     .Select(x => new User(x))
                     .ToArray();
             }
             else
             {
-                return ApplicationContext.Current.Services.UserService.FindMembersByUsername(
+                return ApplicationContext.Current.Services.UserService.FindByUsername(
                     login, 0, int.MaxValue, out totalRecs, StringPropertyMatchType.Exact)
                     .Select(x => new User(x))
                     .ToArray();
diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs
index b90d1e3eb0..75c6788640 100644
--- a/src/umbraco.cms/businesslogic/member/Member.cs
+++ b/src/umbraco.cms/businesslogic/member/Member.cs
@@ -113,7 +113,7 @@ namespace umbraco.cms.businesslogic.member
         public static IEnumerable<Member> GetAllAsList()
         {
             int totalRecs;
-            return ApplicationContext.Current.Services.MemberService.GetAllMembers(0, int.MaxValue, out totalRecs)
+            return ApplicationContext.Current.Services.MemberService.GetAll(0, int.MaxValue, out totalRecs)
                 .Select(x => new Member(x))
                 .ToArray();
         }
@@ -153,7 +153,7 @@ namespace umbraco.cms.businesslogic.member
         public static Member[] getMemberFromFirstLetter(char letter)
         {
             int totalRecs;
-            return ApplicationContext.Current.Services.MemberService.FindMembersByUsername(
+            return ApplicationContext.Current.Services.MemberService.FindByUsername(
                 letter.ToString(CultureInfo.InvariantCulture), 0, int.MaxValue, out totalRecs, StringPropertyMatchType.StartsWith)
                                      .Select(x => new Member(x))
                                      .ToArray();
@@ -170,7 +170,7 @@ namespace umbraco.cms.businesslogic.member
             }
             else
             {
-                var found = ApplicationContext.Current.Services.MemberService.FindMembersByUsername(
+                var found = ApplicationContext.Current.Services.MemberService.FindByUsername(
                     usernameToMatch, 0, int.MaxValue, out totalRecs, StringPropertyMatchType.StartsWith);
                 return found.Select(x => new Member(x)).ToArray();
             }
@@ -290,7 +290,7 @@ namespace umbraco.cms.businesslogic.member
                 return null;
 
             int totalRecs;
-            var found = ApplicationContext.Current.Services.MemberService.FindMembersByEmail(
+            var found = ApplicationContext.Current.Services.MemberService.FindByEmail(
                 email, 0, int.MaxValue, out totalRecs, StringPropertyMatchType.Exact);
 
             return found.Select(x => new Member(x)).ToArray();
diff --git a/src/umbraco.providers/members/UmbracoMembershipProvider.cs b/src/umbraco.providers/members/UmbracoMembershipProvider.cs
index 8f6a056712..6a36273164 100644
--- a/src/umbraco.providers/members/UmbracoMembershipProvider.cs
+++ b/src/umbraco.providers/members/UmbracoMembershipProvider.cs
@@ -30,7 +30,7 @@ namespace umbraco.providers.members
     /// Custom Membership Provider for Umbraco Members (User authentication for Frontend applications NOT umbraco CMS)  
     /// </summary>
     [Obsolete("This has been superceded by Umbraco.Web.Security.Providers.MembersMembershipProvider")]
-    public class UmbracoMembershipProvider : UmbracoMembershipProviderBase, IUmbracoContentTypeMembershipProvider
+    public class UmbracoMembershipProvider : UmbracoMembershipProviderBase, IUmbracoMemberTypeMembershipProvider
     {
         public UmbracoMembershipProvider()
         {
@@ -350,7 +350,7 @@ namespace umbraco.providers.members
         /// </returns>
         public override MembershipUserCollection FindUsersByEmail(string emailToMatch, int pageIndex, int pageSize, out int totalRecords)
         {
-            var byEmail = ApplicationContext.Current.Services.MemberService.FindMembersByEmail(emailToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
+            var byEmail = ApplicationContext.Current.Services.MemberService.FindByEmail(emailToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
             
             var collection = new MembershipUserCollection();                        
             foreach (var m in byEmail)
@@ -372,7 +372,7 @@ namespace umbraco.providers.members
         /// </returns>
         public override MembershipUserCollection FindUsersByName(string usernameToMatch, int pageIndex, int pageSize, out int totalRecords)
         {
-            var byEmail = ApplicationContext.Current.Services.MemberService.FindMembersByUsername(usernameToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
+            var byEmail = ApplicationContext.Current.Services.MemberService.FindByUsername(usernameToMatch, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Wildcard).ToArray();
             
             var collection = new MembershipUserCollection();            
             foreach (var m in byEmail)
@@ -395,7 +395,7 @@ namespace umbraco.providers.members
         {
             var membersList = new MembershipUserCollection();
 
-            var pagedMembers = ApplicationContext.Current.Services.MemberService.GetAllMembers(pageIndex, pageSize, out totalRecords);
+            var pagedMembers = ApplicationContext.Current.Services.MemberService.GetAll(pageIndex, pageSize, out totalRecords);
 
             foreach (var m in pagedMembers)
             {
@@ -412,7 +412,7 @@ namespace umbraco.providers.members
         /// </returns>
         public override int GetNumberOfUsersOnline()
         {
-            return ApplicationContext.Current.Services.MemberService.GetMemberCount(MemberCountType.Online);
+            return ApplicationContext.Current.Services.MemberService.GetCount(MemberCountType.Online);
         }
 
         /// <summary>