diff --git a/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs b/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs
index 6a1216d..619a039 100644
--- a/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs
+++ b/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs
@@ -129,7 +129,7 @@ public async override Task<InfluxDbApiResponse> CreateRetentionPolicyAsync(strin
             // If the default was supplied, run a second query to alter and add the default status since InfluxData.NET doesn't allow for the default argument
             if (response != null && response.Success && isDefault)
             {
-                var alterResponse = await influx.Client.QueryAsync(string.Format("ALTER RETENTION POLICY \"{0}\" ON \"{1}\" DEFAULT",database, policyName, database)).ConfigureAwait(false);
+                var alterResponse = await influx.Client.QueryAsync(string.Format("ALTER RETENTION POLICY \"{0}\" ON \"{1}\" DEFAULT", policyName, database)).ConfigureAwait(false);
             }
 
             return new InfluxDbApiResponse(response.Body, response.StatusCode, response.Success);
@@ -157,7 +157,7 @@ public async override Task<InfluxDbApiResponse> AlterRetentionPolicyAsync(string
             // If the default was supplied, run a second query to alter and add the default status since InfluxData.NET doesn't allow for the default argument
             if (response != null && response.Success && isDefault)
             {
-                var alterResponse = await influx.Client.QueryAsync(string.Format("ALTER RETENTION POLICY \"{0}\" ON \"{1}\" DEFAULT",database, policyName, database)).ConfigureAwait(false);
+                var alterResponse = await influx.Client.QueryAsync(string.Format("ALTER RETENTION POLICY \"{0}\" ON \"{1}\" DEFAULT", policyName, database)).ConfigureAwait(false);
             }
 
             return new InfluxDbApiResponse(response.Body, response.StatusCode, response.Success);
diff --git a/src/CymaticLabs.InfluxDB.Studio/Dialogs/RetentionPolicyDialog.cs b/src/CymaticLabs.InfluxDB.Studio/Dialogs/RetentionPolicyDialog.cs
index cb93468..9e0dede 100644
--- a/src/CymaticLabs.InfluxDB.Studio/Dialogs/RetentionPolicyDialog.cs
+++ b/src/CymaticLabs.InfluxDB.Studio/Dialogs/RetentionPolicyDialog.cs
@@ -62,6 +62,7 @@ public bool IsCreating
                 isCreating = value;
                 nameTextBox.ReadOnly = !isCreating;
                 createButton.Text = isCreating ? "Create" : "Update";
+                Text = isCreating ? "Create Retention Policy" : "Alter Retention Policy";
             }
         }