diff --git a/src/Runner.Listener/Runner.cs b/src/Runner.Listener/Runner.cs
index 243e0e741..5c764c2e3 100644
--- a/src/Runner.Listener/Runner.cs
+++ b/src/Runner.Listener/Runner.cs
@@ -13,11 +13,12 @@ using GitHub.Runner.Listener.Configuration;
 using GitHub.Runner.Sdk;
 using GitHub.Services.WebApi;
 using Pipelines = GitHub.DistributedTask.Pipelines;
+using GitHub.DistributedTask.Pipelines;
+using GitHub.Services.Common;
 using System.Runtime.Serialization;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using GitHub.Services.Common;
 
 namespace GitHub.Runner.Listener
 {
@@ -483,11 +484,13 @@ namespace GitHub.Runner.Listener
                                     var runServer = HostContext.CreateService<IRunServer>();
                                     await runServer.ConnectAsync(new Uri(settings.ServerUrl), creds);
 
-                                    Func<Task<AgentJobRequestMessage>> getJobRequestMessageAsync = async() => {
-                                        return await runServer.GetJobMessageAsync(messageRef.RunnerRequestId);
-                                    };
-
-                                    var jobMessage = await RetryHelper<AgentJobRequestMessage>.RetryWithTimeoutAsync(getJobRequestMessageAsync, TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(10));
+                                    var jobMessage = await RetriesHelper<AgentJobRequestMessage>.RetryWithTimeoutAsync(async () =>
+                                                                                                    {
+                                                                                                        return await runServer.GetJobMessageAsync(messageRef.RunnerRequestId);
+                                                                                                    },
+                                                                                                    TimeSpan.FromSeconds(5),
+                                                                                                    TimeSpan.FromSeconds(10),
+                                                                                                    5);
 
                                     jobDispatcher.Run(jobMessage, runOnce);
                                     if (runOnce)
diff --git a/src/Sdk/Common/Common/Utility/RetryHelper.cs b/src/Sdk/Common/Common/Utility/RetriesHelper.cs
similarity index 86%
rename from src/Sdk/Common/Common/Utility/RetryHelper.cs
rename to src/Sdk/Common/Common/Utility/RetriesHelper.cs
index 4cabcb7d4..7cc509d02 100644
--- a/src/Sdk/Common/Common/Utility/RetryHelper.cs
+++ b/src/Sdk/Common/Common/Utility/RetriesHelper.cs
@@ -6,16 +6,16 @@ namespace GitHub.Services.Common
 {
     [EditorBrowsable(EditorBrowsableState.Never)]
 
-    public static class RetryHelper<T>
+    public static class RetriesHelper<T>
     {
         public static async Task<T> RetryWithTimeoutAsync(
             Func<Task<T>> retriableAction,
             TimeSpan minBackoff,
             TimeSpan maxBackoff,
-            int maxTimeout = 5
+            int maxTimeoutMinutes = 5
         )
         {
-            var remainingTime = TimeSpan.FromMinutes(maxTimeout);
+            var remainingTime = TimeSpan.FromMinutes(maxTimeoutMinutes);
             while (true)
             {
                 try