diff --git a/api/internal/managers/infra/install.go b/api/internal/managers/infra/install.go
index 17aae15e6..41f6d90ba 100644
--- a/api/internal/managers/infra/install.go
+++ b/api/internal/managers/infra/install.go
@@ -28,7 +28,7 @@ import (
 	kyaml "sigs.k8s.io/yaml"
 )
 
-const K0sComponentName = "Runtime"
+const K0sComponentName = "runtime"
 
 func AlreadyInstalledError() error {
 	return fmt.Errorf(
@@ -80,7 +80,7 @@ func (m *infraManager) initComponentsList(license *kotsv1beta1.License, rc runti
 		components = append(components, types.InfraComponent{Name: addOn.Name()})
 	}
 
-	components = append(components, types.InfraComponent{Name: "Additional Components"})
+	components = append(components, types.InfraComponent{Name: "additional components"})
 
 	for _, component := range components {
 		if err := m.infraStore.RegisterComponent(component.Name); err != nil {
@@ -167,7 +167,7 @@ func (m *infraManager) installK0s(ctx context.Context, rc runtimeconfig.RuntimeC
 		}
 	}()
 
-	m.setStatusDesc(fmt.Sprintf("Installing %s", componentName))
+	m.setStatusDesc(fmt.Sprintf("Installing %s...", componentName))
 
 	logFn := m.logFn("k0s")
 
@@ -197,7 +197,7 @@ func (m *infraManager) installK0s(ctx context.Context, rc runtimeconfig.RuntimeC
 		return nil, fmt.Errorf("create kube client: %w", err)
 	}
 
-	m.setStatusDesc(fmt.Sprintf("Waiting for %s", componentName))
+	m.setStatusDesc(fmt.Sprintf("Waiting for %s...", componentName))
 
 	logFn("waiting for node to be ready")
 	if err := m.waitForNode(ctx, kcli); err != nil {
@@ -255,7 +255,7 @@ func (m *infraManager) installAddOns(ctx context.Context, kcli client.Client, mc
 
 			// if in progress, update the overall status to reflect the current component
 			if progress.Status.State == types.StateRunning {
-				m.setStatusDesc(fmt.Sprintf("%s %s", progress.Status.Description, progress.Name))
+				m.setStatusDesc(fmt.Sprintf("%s %s...", progress.Status.Description, progress.Name))
 			}
 
 			// update the status for the current component
@@ -332,7 +332,7 @@ func (m *infraManager) getAddonInstallOpts(license *kotsv1beta1.License, rc runt
 }
 
 func (m *infraManager) installExtensions(ctx context.Context, hcli helm.Client) (finalErr error) {
-	componentName := "Additional Components"
+	componentName := "additional components"
 
 	if err := m.setComponentStatus(componentName, types.StateRunning, "Installing"); err != nil {
 		return fmt.Errorf("set extensions status: %w", err)
@@ -353,7 +353,7 @@ func (m *infraManager) installExtensions(ctx context.Context, hcli helm.Client)
 		}
 	}()
 
-	m.setStatusDesc(fmt.Sprintf("Installing %s", componentName))
+	m.setStatusDesc(fmt.Sprintf("Installing %s...", componentName))
 
 	logFn := m.logFn("extensions")
 	logFn("installing extensions")
diff --git a/cmd/installer/cli/install.go b/cmd/installer/cli/install.go
index e0dbb18df..590a1792a 100644
--- a/cmd/installer/cli/install.go
+++ b/cmd/installer/cli/install.go
@@ -1015,7 +1015,7 @@ func initializeInstall(ctx context.Context, flags InstallCmdFlags, rc runtimecon
 
 func installAndStartCluster(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, mutate func(*k0sv1beta1.ClusterConfig) error) (*k0sv1beta1.ClusterConfig, error) {
 	loading := spinner.Start()
-	loading.Infof("Installing node")
+	loading.Infof("Installing runtime")
 	logrus.Debugf("creating k0s configuration file")
 
 	eucfg, err := helpers.ParseEndUserConfig(flags.overrides)
@@ -1025,36 +1025,36 @@ func installAndStartCluster(ctx context.Context, flags InstallCmdFlags, rc runti
 
 	cfg, err := k0s.WriteK0sConfig(ctx, flags.networkInterface, flags.airgapBundle, rc.PodCIDR(), rc.ServiceCIDR(), eucfg, mutate)
 	if err != nil {
-		loading.ErrorClosef("Failed to install node")
+		loading.ErrorClosef("Failed to install runtime")
 		return nil, fmt.Errorf("create config file: %w", err)
 	}
 
 	logrus.Debugf("creating systemd unit files")
 	if err := hostutils.CreateSystemdUnitFiles(ctx, logrus.StandardLogger(), rc, false); err != nil {
-		loading.ErrorClosef("Failed to install node")
+		loading.ErrorClosef("Failed to install runtime")
 		return nil, fmt.Errorf("create systemd unit files: %w", err)
 	}
 
 	logrus.Debugf("installing k0s")
 	if err := k0s.Install(rc); err != nil {
-		loading.ErrorClosef("Failed to install node")
+		loading.ErrorClosef("Failed to install runtime")
 		return nil, fmt.Errorf("install cluster: %w", err)
 	}
 
 	logrus.Debugf("waiting for k0s to be ready")
 	if err := k0s.WaitForK0s(); err != nil {
-		loading.ErrorClosef("Failed to install node")
+		loading.ErrorClosef("Failed to install runtime")
 		return nil, fmt.Errorf("wait for k0s: %w", err)
 	}
 
-	loading.Infof("Waiting for node")
-	logrus.Debugf("waiting for node to be ready")
+	loading.Infof("Waiting for runtime")
+	logrus.Debugf("waiting for runtime to be ready")
 	if err := waitForNode(ctx); err != nil {
-		loading.ErrorClosef("Node failed to become ready")
-		return nil, fmt.Errorf("wait for node: %w", err)
+		loading.ErrorClosef("Runtime failed to become ready")
+		return nil, fmt.Errorf("wait for runtime: %w", err)
 	}
 
-	loading.Closef("Node is ready")
+	loading.Closef("Runtime is ready")
 	return cfg, nil
 }
 
@@ -1070,7 +1070,7 @@ func installAddons(ctx context.Context, kcli client.Client, mcli metadata.Interf
 				loading = spinner.Start()
 				loading.Infof("Installing %s", progress.Name)
 			case apitypes.StateSucceeded:
-				loading.Closef("%s is ready", progress.Name)
+				loading.Closef("%s is ready", strings.ToUpper(progress.Name[:1])+progress.Name[1:])
 			case apitypes.StateFailed:
 				loading.ErrorClosef("Failed to install %s", progress.Name)
 			}
diff --git a/cmd/installer/cli/restore.go b/cmd/installer/cli/restore.go
index 0192386a5..aade02811 100644
--- a/cmd/installer/cli/restore.go
+++ b/cmd/installer/cli/restore.go
@@ -462,7 +462,7 @@ func installAddonsForRestore(ctx context.Context, kcli client.Client, mcli metad
 				loading = spinner.Start()
 				loading.Infof("Installing %s", progress.Name)
 			case apitypes.StateSucceeded:
-				loading.Closef("%s is ready", progress.Name)
+				loading.Closef("%s is ready", strings.ToUpper(progress.Name[:1])+progress.Name[1:])
 			case apitypes.StateFailed:
 				loading.ErrorClosef("Failed to install %s", progress.Name)
 			}
diff --git a/e2e/scripts/restore-installation-airgap.exp b/e2e/scripts/restore-installation-airgap.exp
index 6b9199094..e5c749355 100755
--- a/e2e/scripts/restore-installation-airgap.exp
+++ b/e2e/scripts/restore-installation-airgap.exp
@@ -92,7 +92,7 @@ expect {
 }
 
 expect {
-    -timeout 300 "Disaster Recovery is ready" {}
+    -timeout 300 "Disaster recovery is ready" {}
     timeout {
       puts "\n\nFailed to wait for Disaster Recovery to be ready."
       exit 1
diff --git a/e2e/scripts/restore-installation.exp b/e2e/scripts/restore-installation.exp
index 2dd8877c7..a1b80b46b 100755
--- a/e2e/scripts/restore-installation.exp
+++ b/e2e/scripts/restore-installation.exp
@@ -92,7 +92,7 @@ expect {
 }
 
 expect {
-    -timeout 300 "Disaster Recovery is ready" {}
+    -timeout 300 "Disaster recovery is ready" {}
     timeout {
       puts "\n\nFailed to wait for Disaster Recovery to be ready."
       exit 1
diff --git a/e2e/scripts/restore-multi-node-airgap-phase1.exp b/e2e/scripts/restore-multi-node-airgap-phase1.exp
index 8d359cfbb..f2255b707 100755
--- a/e2e/scripts/restore-multi-node-airgap-phase1.exp
+++ b/e2e/scripts/restore-multi-node-airgap-phase1.exp
@@ -80,7 +80,7 @@ expect {
 }
 
 expect {
-    -timeout 300 "Disaster Recovery is ready" {}
+    -timeout 300 "Disaster recovery is ready" {}
     timeout {
       puts "\n\nFailed to wait for Disaster Recovery to be ready."
       exit 1
diff --git a/e2e/scripts/restore-multi-node-phase1.exp b/e2e/scripts/restore-multi-node-phase1.exp
index 4408a281d..28fd183c6 100755
--- a/e2e/scripts/restore-multi-node-phase1.exp
+++ b/e2e/scripts/restore-multi-node-phase1.exp
@@ -80,7 +80,7 @@ expect {
 }
 
 expect {
-    -timeout 300 "Disaster Recovery is ready" {}
+    -timeout 300 "Disaster recovery is ready" {}
     timeout {
       puts "\n\nFailed to wait for Disaster Recovery to be ready."
       exit 1
diff --git a/e2e/scripts/resume-restore.exp b/e2e/scripts/resume-restore.exp
index cdf667eff..23944b2d8 100755
--- a/e2e/scripts/resume-restore.exp
+++ b/e2e/scripts/resume-restore.exp
@@ -113,7 +113,7 @@ expect {
 }
 
 expect {
-    -timeout 300 "Disaster Recovery is ready" {}
+    -timeout 300 "Disaster recovery is ready" {}
     timeout {
       puts "\n\nFailed to wait for Disaster Recovery to be ready."
       exit 1
diff --git a/pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go b/pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go
index b94eceffa..95b374f36 100644
--- a/pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go
+++ b/pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go
@@ -48,7 +48,7 @@ type EmbeddedClusterOperator struct {
 }
 
 func (e *EmbeddedClusterOperator) Name() string {
-	return "Runtime Operator"
+	return "runtime operator"
 }
 
 func (e *EmbeddedClusterOperator) Version() string {
diff --git a/pkg/addons/openebs/openebs.go b/pkg/addons/openebs/openebs.go
index 3c0c353f6..09641dc7d 100644
--- a/pkg/addons/openebs/openebs.go
+++ b/pkg/addons/openebs/openebs.go
@@ -19,7 +19,7 @@ type OpenEBS struct {
 }
 
 func (o *OpenEBS) Name() string {
-	return "Storage"
+	return "storage"
 }
 
 func (o *OpenEBS) Version() string {
diff --git a/pkg/addons/velero/velero.go b/pkg/addons/velero/velero.go
index cf3f19b94..2b1feb555 100644
--- a/pkg/addons/velero/velero.go
+++ b/pkg/addons/velero/velero.go
@@ -46,7 +46,7 @@ type Velero struct {
 }
 
 func (v *Velero) Name() string {
-	return "Disaster Recovery"
+	return "disaster recovery"
 }
 
 func (v *Velero) Version() string {
diff --git a/web/src/components/wizard/CompletionStep.tsx b/web/src/components/wizard/CompletionStep.tsx
index 9774b30e6..0faa4f1d3 100644
--- a/web/src/components/wizard/CompletionStep.tsx
+++ b/web/src/components/wizard/CompletionStep.tsx
@@ -6,7 +6,7 @@ import { useBranding } from "../../contexts/BrandingContext";
 import { CheckCircle, ExternalLink } from "lucide-react";
 
 const CompletionStep: React.FC = () => {
-  const { config } = useConfig();
+  const { config, prototypeSettings } = useConfig();
   const { title } = useBranding();
 
   return (
@@ -15,7 +15,7 @@ const CompletionStep: React.FC = () => {
         <div className="flex flex-col items-center text-center py-6">
           <div className="flex flex-col items-center justify-center mb-6">
             <div className="w-16 h-16 rounded-full flex items-center justify-center mb-4">
-              <CheckCircle className="w-10 h-10" style={{ color: "blue" }} />
+              <CheckCircle className="w-10 h-10" style={{ color: prototypeSettings.themeColor }} />
             </div>
             <p className="text-gray-600 mt-2">
               Visit the Admin Console to configure and install {title}
diff --git a/web/src/components/wizard/InstallationStep.tsx b/web/src/components/wizard/InstallationStep.tsx
index 9fdadadde..5be3e0246 100644
--- a/web/src/components/wizard/InstallationStep.tsx
+++ b/web/src/components/wizard/InstallationStep.tsx
@@ -68,7 +68,7 @@ const InstallationStep: React.FC<InstallationStepProps> = ({ onNext }) => {
     <div className="space-y-6">
       <InstallationProgress
         progress={getProgress()}
-        currentMessage={infraStatusResponse?.status?.description || ''}
+        currentMessage={infraStatusResponse?.status?.state === 'Failed' ? 'Installation failed' : (infraStatusResponse?.status?.description || '')}
         themeColor={themeColor}
         status={infraStatusResponse?.status?.state}
       />
@@ -77,7 +77,7 @@ const InstallationStep: React.FC<InstallationStepProps> = ({ onNext }) => {
         {(infraStatusResponse?.components || []).map((component, index) => (
           <StatusIndicator 
             key={index}
-            title={component.name} 
+            title={component.name.split(' ').map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(' ')}
             status={component.status?.state}
             themeColor={themeColor}
           />
diff --git a/web/src/components/wizard/SetupStep.tsx b/web/src/components/wizard/SetupStep.tsx
index e7df99ef7..fb116fee7 100644
--- a/web/src/components/wizard/SetupStep.tsx
+++ b/web/src/components/wizard/SetupStep.tsx
@@ -142,7 +142,7 @@ const SetupStep: React.FC<SetupStepProps> = ({ onNext }) => {
       <Card>
         <div className="mb-6">
           <h2 className="text-2xl font-bold text-gray-900">{text.setupTitle}</h2>
-          <p className="text-gray-600 mt-1">Configure the installation settings.</p>
+          <p className="text-gray-600 mt-1">Set up the host for this installation.</p>
         </div>
 
         {isLoading ? (
diff --git a/web/src/components/wizard/tests/SetupStep.test.tsx b/web/src/components/wizard/tests/SetupStep.test.tsx
index 0b31971af..83a4972f1 100644
--- a/web/src/components/wizard/tests/SetupStep.test.tsx
+++ b/web/src/components/wizard/tests/SetupStep.test.tsx
@@ -78,7 +78,7 @@ describe("SetupStep", () => {
     // Wait for loading to complete
     await screen.findByText("Loading configuration...");
 
-    await screen.findByText("Configure the installation settings.");
+    await screen.findByText("Set up the host for this installation.");
 
     // Wait for the linux-setup element to appear
     await screen.findByTestId("linux-setup");
@@ -155,7 +155,7 @@ describe("SetupStep", () => {
 
     // Wait for loading to complete
     await screen.findByText("Loading configuration...");
-    await screen.findByText("Configure the installation settings.");
+    await screen.findByText("Set up the host for this installation.");
 
     // Wait for the linux-setup element to appear
     await screen.findByTestId("linux-setup");
@@ -249,7 +249,7 @@ describe("SetupStep", () => {
 
     // Wait for loading to complete
     await screen.findByText("Loading configuration...");
-    await screen.findByText("Configure the installation settings.");
+    await screen.findByText("Set up the host for this installation.");
 
     // Wait for the linux-setup element to appear
     await screen.findByTestId("linux-setup");