diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
index d5b2e98..c253f62 100644
--- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
+++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml
@@ -79,7 +79,7 @@ Methods:
                 External: $.exposeCAdvisor
           - $._environment.securityGroupManager.addGroupIngress($securityGroupIngress)
 
-          - $._environment.reporter.report($, 'Setup Kubernetes Minion on {0}'.format($.instance.name))
+          - $._environment.reporter.report($, 'Setup Kubernetes Node on {0}'.format($.instance.name))
           - $template: $resources.yaml('KubeMinionSetup.template').bind(dict(
                 name => $.instance.name,
                 ip => $.getIp(),
@@ -98,7 +98,7 @@ Methods:
     Body:
       - If: $.getAttr(nodeConfigured, false)
         Then:
-          - $._environment.reporter.report($this, 'Deleting Kubernetes Minion')
+          - $._environment.reporter.report($this, 'Deleting Kubernetes Node')
           - $resources: new(sys:Resources)
           - $template: $resources.yaml('EtcdRemoveMember.template').bind(dict(
                 nodeId => $.getIp()
diff --git a/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template b/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template
index c45aedd..dab95ef 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template
+++ b/Kubernetes/KubernetesCluster/package/Resources/KubeMinionSetup.template
@@ -12,7 +12,7 @@
 
 FormatVersion: 2.0.0
 Version: 1.0.0
-Name: Setup Kubernetes Minion
+Name: Setup Kubernetes Node
 
 Parameters:
   name: $name
@@ -70,4 +70,4 @@ Scripts:
     EntryPoint: restartDocker.sh
     Options:
       captureStdout: false
-      captureStderr: false
\ No newline at end of file
+      captureStderr: false
diff --git a/Kubernetes/KubernetesCluster/package/Resources/RemoveMinion.template b/Kubernetes/KubernetesCluster/package/Resources/RemoveMinion.template
index 8b157b6..82851f1 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/RemoveMinion.template
+++ b/Kubernetes/KubernetesCluster/package/Resources/RemoveMinion.template
@@ -12,7 +12,7 @@
 
 FormatVersion: 2.0.0
 Version: 1.0.0
-Name: Remove Minion
+Name: Remove Kubernetes Node
 
 Parameters:
   nodeId: $nodeId
diff --git a/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh b/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh
index 9e6db2f..06ccb85 100644
--- a/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh
+++ b/Kubernetes/KubernetesCluster/package/Resources/scripts/removeMinion.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-echo "Deleting a Minion" >> /tmp/murano-kube.log
+echo "Deleting Kubernetes Node" >> /tmp/murano-kube.log
 /opt/bin/kubectl delete node $1 >> /tmp/murano-kube.log
diff --git a/Kubernetes/KubernetesCluster/package/UI/ui.yaml b/Kubernetes/KubernetesCluster/package/UI/ui.yaml
index 014e4a5..ffad37e 100644
--- a/Kubernetes/KubernetesCluster/package/UI/ui.yaml
+++ b/Kubernetes/KubernetesCluster/package/UI/ui.yaml
@@ -83,20 +83,20 @@ Forms:
             underline are allowed
         - name: minionCount
           type: integer
-          label: Initial/current number of minions
+          label: Initial/current number of Kubernetes nodes
           initial: 2
           minValue: 1
           required: true
           description: >-
-            Select number of minions
+            Select number of Kubernetes nodes
         - name: maxMinionCount
           type: integer
-          label: Maximum number of minions
+          label: Maximum number of Kubernetes nodes
           initial: 3
           required: true
           minValue: 1
           description: >-
-            Select maximum number of minions
+            Select maximum number of Kubernetes nodes
         - name: assignFloatingIP
           type: boolean
           initial: true
@@ -128,7 +128,7 @@ Forms:
           type: integer
           label: Initial/current number of gateway nodes
           initial: 1
-          minValue: 0
+          minValue: 1
           required: true
           description: >-
             External traffic will be routed through gateway nodes.