diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 1b972bb..af66e22 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,4 +1,9 @@
-# 0.2.1
+# 0.2.2
+
+- [Feature] Better test run names
+- [Fix] Common API version for all endpoints
+
+# 0.2.0
 
 - [Fix] Big refactoring to create a new test run before posting results
 
diff --git a/src/PipelinesTestLogger/ApiClient.cs b/src/PipelinesTestLogger/ApiClient.cs
index d2351b5..50ab589 100644
--- a/src/PipelinesTestLogger/ApiClient.cs
+++ b/src/PipelinesTestLogger/ApiClient.cs
@@ -11,7 +11,7 @@ namespace PipelinesTestLogger
 {
     internal class ApiClient
     {
-        private const string ApiVersion = "5.0-preview.5";
+        private const string ApiVersion = "5.0-preview.2";
 
         private static readonly HttpClient _client = new HttpClient();
 
diff --git a/src/PipelinesTestLogger/LoggerQueue.cs b/src/PipelinesTestLogger/LoggerQueue.cs
index 2c41606..60a6f0f 100644
--- a/src/PipelinesTestLogger/LoggerQueue.cs
+++ b/src/PipelinesTestLogger/LoggerQueue.cs
@@ -9,8 +9,8 @@ namespace PipelinesTestLogger
     internal class LoggerQueue
     {
         private readonly ApiClient _apiClient;
+        private readonly string _runName;
         private readonly string _buildId;
-        private readonly string _jobName;
 
         private readonly AsyncProducerConsumerCollection<string> _queue = new AsyncProducerConsumerCollection<string>();
         private readonly Task _consumeTask;
@@ -20,11 +20,11 @@ internal class LoggerQueue
         private int totalEnqueued = 0;
         private int totalSent = 0;
 
-        public LoggerQueue(ApiClient apiClient, string buildId, string jobName)
+        public LoggerQueue(ApiClient apiClient, string buildId, string agentName, string jobName)
         {
             _apiClient = apiClient;
             _buildId = buildId;
-            _jobName = jobName;
+            _runName = $"{ jobName } on { agentName } at {DateTime.UtcNow.ToString("o")}";
             _consumeTask = ConsumeItemsAsync(_consumeTaskCancellationSource.Token);
         }
 
@@ -104,7 +104,7 @@ private async Task<int> CreateTestRun(CancellationToken cancellationToken)
         {
             Dictionary<string, object> request = new Dictionary<string, object>
             {
-                { "name", $"{_jobName} at {DateTime.UtcNow.ToString("o")}"},
+                { "name", _runName },
                 { "build", new Dictionary<string, object> { { "id", _buildId } } },
                 { "isAutomated", true }
             };
diff --git a/src/PipelinesTestLogger/PipelinesTestLogger.cs b/src/PipelinesTestLogger/PipelinesTestLogger.cs
index 115a092..b9b2e84 100644
--- a/src/PipelinesTestLogger/PipelinesTestLogger.cs
+++ b/src/PipelinesTestLogger/PipelinesTestLogger.cs
@@ -32,13 +32,14 @@ public void Initialize(TestLoggerEvents events, string testRunDirectory)
                 || !GetRequiredVariable("SYSTEM_TEAMFOUNDATIONCOLLECTIONURI", out string collectionUri)
                 || !GetRequiredVariable("SYSTEM_TEAMPROJECT", out string teamProject)
                 || !GetRequiredVariable("BUILD_BUILDID", out string buildId)
+                || !GetRequiredVariable("AGENT_NAME", out string agentName)
                 || !GetRequiredVariable("AGENT_JOBNAME", out string jobName))
             {
                 return;
             }
 
             ApiClient apiClient = new ApiClient(accessToken, collectionUri, teamProject);
-            _queue = new LoggerQueue(apiClient, buildId, jobName);
+            _queue = new LoggerQueue(apiClient, buildId, agentName, jobName);
 
             // Register for the events.
             events.TestRunMessage += TestMessageHandler;