diff --git a/agent/windows-setup-agent/Icinga2SetupAgent.csproj b/agent/windows-setup-agent/Icinga2SetupAgent.csproj
index ca0921cb5..4229f0183 100644
--- a/agent/windows-setup-agent/Icinga2SetupAgent.csproj
+++ b/agent/windows-setup-agent/Icinga2SetupAgent.csproj
@@ -80,11 +80,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AgentWizard.cs">
+    <Compile Include="SetupWizard.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AgentWizard.Designer.cs">
-      <DependentUpon>AgentWizard.cs</DependentUpon>
+    <Compile Include="SetupWizard.Designer.cs">
+      <DependentUpon>SetupWizard.cs</DependentUpon>
     </Compile>
     <Compile Include="EndpointInputBox.cs">
       <SubType>Form</SubType>
@@ -94,8 +94,8 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="AgentWizard.resx">
-      <DependentUpon>AgentWizard.cs</DependentUpon>
+    <EmbeddedResource Include="SetupWizard.resx">
+      <DependentUpon>SetupWizard.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="EndpointInputBox.resx">
       <DependentUpon>EndpointInputBox.cs</DependentUpon>
diff --git a/agent/windows-setup-agent/Program.cs b/agent/windows-setup-agent/Program.cs
index ee30b986f..e0f23e401 100644
--- a/agent/windows-setup-agent/Program.cs
+++ b/agent/windows-setup-agent/Program.cs
@@ -13,7 +13,7 @@ namespace Icinga
 		{
 			Application.EnableVisualStyles();
 			Application.SetCompatibleTextRenderingDefault(false);
-			Application.Run(new AgentWizard());
+			Application.Run(new SetupWizard());
 		}
 	}
 }
diff --git a/agent/windows-setup-agent/AgentWizard.Designer.cs b/agent/windows-setup-agent/SetupWizard.Designer.cs
similarity index 99%
rename from agent/windows-setup-agent/AgentWizard.Designer.cs
rename to agent/windows-setup-agent/SetupWizard.Designer.cs
index d55854124..aaf9d97f2 100644
--- a/agent/windows-setup-agent/AgentWizard.Designer.cs
+++ b/agent/windows-setup-agent/SetupWizard.Designer.cs
@@ -1,6 +1,6 @@
 namespace Icinga
 {
-	partial class AgentWizard
+	partial class SetupWizard
 	{
 		/// <summary>
 		/// Required designer variable.
@@ -28,7 +28,7 @@
 		/// </summary>
 		private void InitializeComponent()
 		{
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AgentWizard));
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SetupWizard));
 			this.btnBack = new System.Windows.Forms.Button();
 			this.btnNext = new System.Windows.Forms.Button();
 			this.btnCancel = new System.Windows.Forms.Button();
@@ -51,6 +51,7 @@
 			this.btnRemoveEndpoint = new System.Windows.Forms.Button();
 			this.btnAddEndpoint = new System.Windows.Forms.Button();
 			this.lvwEndpoints = new System.Windows.Forms.ListView();
+			this.colInstanceName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.colHost = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.colPort = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.rdoNoMaster = new System.Windows.Forms.RadioButton();
@@ -74,7 +75,6 @@
 			this.txtError = new System.Windows.Forms.TextBox();
 			this.lblError = new System.Windows.Forms.Label();
 			this.picBanner = new System.Windows.Forms.PictureBox();
-			this.colInstanceName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
 			this.tabFinish.SuspendLayout();
 			this.tabConfigure.SuspendLayout();
 			this.tabParameters.SuspendLayout();
@@ -198,7 +198,7 @@
 			this.lblTicket.Name = "lblTicket";
 			this.lblTicket.Size = new System.Drawing.Size(71, 13);
 			this.lblTicket.TabIndex = 4;
-			this.lblTicket.Text = "Agent Ticket:";
+			this.lblTicket.Text = "Setup Ticket:";
 			// 
 			// txtInstanceName
 			// 
@@ -321,6 +321,11 @@
 			this.lvwEndpoints.View = System.Windows.Forms.View.Details;
 			this.lvwEndpoints.SelectedIndexChanged += new System.EventHandler(this.lvwEndpoints_SelectedIndexChanged);
 			// 
+			// colInstanceName
+			// 
+			this.colInstanceName.Text = "Instance Name";
+			this.colInstanceName.Width = 200;
+			// 
 			// colHost
 			// 
 			this.colHost.Text = "Host";
@@ -347,6 +352,7 @@
 			// rdoNewMaster
 			// 
 			this.rdoNewMaster.AutoSize = true;
+			this.rdoNewMaster.Enabled = false;
 			this.rdoNewMaster.Location = new System.Drawing.Point(11, 22);
 			this.rdoNewMaster.Name = "rdoNewMaster";
 			this.rdoNewMaster.Size = new System.Drawing.Size(167, 17);
@@ -548,12 +554,7 @@
 			this.picBanner.TabIndex = 1;
 			this.picBanner.TabStop = false;
 			// 
-			// colInstanceName
-			// 
-			this.colInstanceName.Text = "Instance Name";
-			this.colInstanceName.Width = 200;
-			// 
-			// AgentWizard
+			// SetupWizard
 			// 
 			this.AcceptButton = this.btnNext;
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -568,8 +569,8 @@
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 			this.MaximizeBox = false;
-			this.Name = "AgentWizard";
-			this.Text = "Icinga 2 Agent Wizard";
+			this.Name = "SetupWizard";
+			this.Text = "Icinga 2 Setup Wizard";
 			this.Shown += new System.EventHandler(this.AgentWizard_Shown);
 			this.tabFinish.ResumeLayout(false);
 			this.tabFinish.PerformLayout();
diff --git a/agent/windows-setup-agent/AgentWizard.cs b/agent/windows-setup-agent/SetupWizard.cs
similarity index 99%
rename from agent/windows-setup-agent/AgentWizard.cs
rename to agent/windows-setup-agent/SetupWizard.cs
index ec992aad9..143b4077e 100644
--- a/agent/windows-setup-agent/AgentWizard.cs
+++ b/agent/windows-setup-agent/SetupWizard.cs
@@ -16,11 +16,11 @@ using System.Security.AccessControl;
 
 namespace Icinga
 {
-	public partial class AgentWizard : Form
+	public partial class SetupWizard : Form
 	{
 		private string _TrustedFile;
 
-		public AgentWizard()
+		public SetupWizard()
 		{
 			InitializeComponent();
 
diff --git a/agent/windows-setup-agent/AgentWizard.resx b/agent/windows-setup-agent/SetupWizard.resx
similarity index 100%
rename from agent/windows-setup-agent/AgentWizard.resx
rename to agent/windows-setup-agent/SetupWizard.resx