diff --git a/DigitalLearningSolutions.Data.Tests/Services/EnrolServiceTest.cs b/DigitalLearningSolutions.Data.Tests/Services/EnrolServiceTest.cs
index 24887ceef4..bef4a75fba 100644
--- a/DigitalLearningSolutions.Data.Tests/Services/EnrolServiceTest.cs
+++ b/DigitalLearningSolutions.Data.Tests/Services/EnrolServiceTest.cs
@@ -9,6 +9,7 @@
 using DigitalLearningSolutions.Data.Models.User;
 using DigitalLearningSolutions.Data.Models.Courses;
 using DigitalLearningSolutions.Data.Models.Email;
+using DigitalLearningSolutions.Data.DataServices.UserDataService;
 
 namespace DigitalLearningSolutions.Data.Tests.Services
 {
@@ -18,8 +19,8 @@ public partial class EnrolServiceTest
         private IEnrolService enrolService = null!;
         private ITutorialContentDataService tutorialContentDataService = null!;
         private IProgressDataService progressDataService = null!;
-        private IUserService userService = null!;
-        private ICourseService courseService = null!;
+        private IUserDataService userDataService = null!;
+        private ICourseDataService courseDataService = null!;
         private IConfiguration configuration = null!;
         private IEmailService emailService = null!;
 
@@ -38,27 +39,21 @@ public void Setup()
             clockService = A.Fake<IClockService>();
             tutorialContentDataService = A.Fake<ITutorialContentDataService>();
             progressDataService = A.Fake<IProgressDataService>();
-            userService = A.Fake<IUserService>();
-            courseService = A.Fake<ICourseService>();
+            userDataService = A.Fake<IUserDataService>();
+            courseDataService = A.Fake<ICourseDataService>();
             emailService = A.Fake<IEmailService>();
             enrolService = new EnrolService(
                clockService,
                tutorialContentDataService,
                progressDataService,
-               userService,
-               courseService,
+               userDataService,
+               courseDataService,
                configuration,
                emailService
                );
             A.CallTo(() => configuration["AppRootPath"]).Returns("baseUrl");
-            // DatabaseModificationsDoNothing();
         }
 
-        //private void DatabaseModificationsDoNothing()
-        //{
-        //    A.CallTo(() => emailService.ScheduleEmail(A<Email>._, A<string>._)).DoesNothing();
-        //}
-
         [Test]
         public void EnrolDelegateOnCourse_With_All_Details()
         {
diff --git a/DigitalLearningSolutions.Data.Tests/Services/GroupServiceTests/GroupsServiceTests.cs b/DigitalLearningSolutions.Data.Tests/Services/GroupServiceTests/GroupsServiceTests.cs
index ae542ba38a..c173f48a70 100644
--- a/DigitalLearningSolutions.Data.Tests/Services/GroupServiceTests/GroupsServiceTests.cs
+++ b/DigitalLearningSolutions.Data.Tests/Services/GroupServiceTests/GroupsServiceTests.cs
@@ -4,6 +4,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using DigitalLearningSolutions.Data.DataServices;
+    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Models.CustomPrompts;
     using DigitalLearningSolutions.Data.Models.DelegateGroups;
@@ -51,8 +52,8 @@ public partial class GroupsServiceTests
         private ILogger<IGroupsService> logger = null!;
         private IProgressDataService progressDataService = null!;
         private ITutorialContentDataService tutorialContentDataService = null!;
-        private IUserService userService = null!;
-        private ICourseService courseService = null!;
+        private IUserDataService userDataService = null!;
+        private ICourseDataService courseDataService = null!;
         [SetUp]
         public void Setup()
         {
@@ -65,14 +66,14 @@ public void Setup()
             centreRegistrationPromptsService = A.Fake<ICentreRegistrationPromptsService>();
             logger = A.Fake<ILogger<IGroupsService>>();
             jobGroupsDataService = A.Fake<IJobGroupsDataService>(x => x.Strict());
-            userService = A.Fake<IUserService>();
-            courseService = A.Fake<ICourseService>();
+            userDataService = A.Fake<IUserDataService>();
+            courseDataService = A.Fake<ICourseDataService>();
             enrolService = new EnrolService(
                 clockService,
-                tutorialContentDataService,
+            tutorialContentDataService,
                 progressDataService,
-                userService,
-                courseService,
+                userDataService,
+                courseDataService,
                 configuration,
                 emailService
                 );
@@ -80,7 +81,6 @@ public void Setup()
                 groupsDataService,
                 clockService,
                 jobGroupsDataService,
-                configuration,
                 centreRegistrationPromptsService,
                 enrolService,
                 logger
diff --git a/DigitalLearningSolutions.Data/Services/EnrolService.cs b/DigitalLearningSolutions.Data/Services/EnrolService.cs
index 2d75249ff7..14fe00fe81 100644
--- a/DigitalLearningSolutions.Data/Services/EnrolService.cs
+++ b/DigitalLearningSolutions.Data/Services/EnrolService.cs
@@ -1,4 +1,5 @@
 using DigitalLearningSolutions.Data.DataServices;
+using DigitalLearningSolutions.Data.DataServices.UserDataService;
 using DigitalLearningSolutions.Data.Extensions;
 using DigitalLearningSolutions.Data.Models.Courses;
 using DigitalLearningSolutions.Data.Models.DelegateGroups;
@@ -39,8 +40,8 @@ public class EnrolService : IEnrolService
         private readonly IClockService clockService;
         private readonly IProgressDataService progressDataService;
         private readonly ITutorialContentDataService tutorialContentDataService;
-        private readonly IUserService userService;
-        private readonly ICourseService courseService;
+        private readonly IUserDataService userDataService;
+        private readonly ICourseDataService courseDataService;
         private readonly IConfiguration configuration;
         private readonly IEmailService emailService;
 
@@ -48,8 +49,8 @@ public EnrolService(
             IClockService clockService,
             ITutorialContentDataService tutorialContentDataService,
             IProgressDataService progressDataService,
-            IUserService userService,
-            ICourseService courseService,
+            IUserDataService userDataService,
+            ICourseDataService courseDataService,
             IConfiguration configuration,
             IEmailService emailService
         )
@@ -57,17 +58,17 @@ IEmailService emailService
             this.clockService = clockService;
             this.tutorialContentDataService = tutorialContentDataService;
             this.progressDataService = progressDataService;
-            this.userService = userService;
-            this.courseService = courseService;
+            this.userDataService = userDataService;
+            this.courseDataService = courseDataService;
             this.configuration = configuration;
             this.emailService = emailService;
         }
         public void EnrolDelegateOnCourse(int delegateId, int customisationId, int customisationVersion, int enrollmentMethodId, int? enrolledByAdminId, DateTime? completeByDate, int? supervisorAdminId, string addedByProcess, string? delegateName, string? delegateEmail)
         {
-            var course = courseService.GetCourseNameAndApplication(customisationId);
+            var course = courseDataService.GetCourseNameAndApplication(customisationId);
             if (delegateName == null || delegateEmail == null)
             {
-                var delegateUser = userService.GetDelegateUserById(delegateId);
+                var delegateUser = userDataService.GetDelegateUserById(delegateId);
                 if (delegateUser == null || course == null) return;
                 delegateEmail = delegateUser.EmailAddress;
                 delegateName = delegateUser.FirstName + " " + delegateUser.LastName;
diff --git a/DigitalLearningSolutions.Data/Services/GroupsService.cs b/DigitalLearningSolutions.Data/Services/GroupsService.cs
index bcd77848c5..2b627e6595 100644
--- a/DigitalLearningSolutions.Data/Services/GroupsService.cs
+++ b/DigitalLearningSolutions.Data/Services/GroupsService.cs
@@ -98,7 +98,6 @@ public class GroupsService : IGroupsService
         private const string AddCourseToGroupAddedByProcess = "AddCourseToDelegateGroup_Refactor";
         private readonly ICentreRegistrationPromptsService centreRegistrationPromptsService;
         private readonly IClockService clockService;
-        private readonly IConfiguration configuration;
         private readonly IGroupsDataService groupsDataService;
         private readonly IJobGroupsDataService jobGroupsDataService;
         private readonly ILogger<IGroupsService> logger;
@@ -108,7 +107,6 @@ public GroupsService(
             IGroupsDataService groupsDataService,
             IClockService clockService,
             IJobGroupsDataService jobGroupsDataService,
-            IConfiguration configuration,
             ICentreRegistrationPromptsService centreRegistrationPromptsService,
             IEnrolService enrolService,
             ILogger<IGroupsService> logger
@@ -117,7 +115,6 @@ ILogger<IGroupsService> logger
             this.groupsDataService = groupsDataService;
             this.clockService = clockService;
             this.jobGroupsDataService = jobGroupsDataService;
-            this.configuration = configuration;
             this.centreRegistrationPromptsService = centreRegistrationPromptsService;
             this.enrolService = enrolService;
             this.logger = logger;