diff --git a/wicket/src/state/inventory.rs b/wicket/src/state/inventory.rs
index 3a561167b1..02019898e8 100644
--- a/wicket/src/state/inventory.rs
+++ b/wicket/src/state/inventory.rs
@@ -6,6 +6,7 @@
 
 use anyhow::anyhow;
 use once_cell::sync::Lazy;
+use ratatui::text::Text;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::fmt::Display;
@@ -184,7 +185,7 @@ impl Component {
     }
 }
 
-/// The component type and its slot.
+// The component type and its slot.
 #[derive(
     Debug,
     Clone,
@@ -204,24 +205,27 @@ pub enum ComponentId {
 }
 
 impl ComponentId {
-    pub fn to_string_uppercase(&self) -> String {
-        let mut s = self.to_string();
-        s.make_ascii_uppercase();
-        s
+    pub fn name(&self) -> String {
+        self.to_string()
     }
 }
 
-/// Prints the component type in standard case.
 impl Display for ComponentId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
-            ComponentId::Sled(i) => write!(f, "sled {}", i),
-            ComponentId::Switch(i) => write!(f, "switch {}", i),
+            ComponentId::Sled(i) => write!(f, "SLED {}", i),
+            ComponentId::Switch(i) => write!(f, "SWITCH {}", i),
             ComponentId::Psc(i) => write!(f, "PSC {}", i),
         }
     }
 }
 
+impl From<ComponentId> for Text<'_> {
+    fn from(value: ComponentId) -> Self {
+        value.to_string().into()
+    }
+}
+
 pub struct ParsableComponentId<'a> {
     pub sp_type: &'a str,
     pub i: &'a str,
@@ -265,15 +269,3 @@ impl PowerState {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn component_id_display() {
-        assert_eq!(ComponentId::Sled(0).to_string(), "sled 0");
-        assert_eq!(ComponentId::Switch(1).to_string(), "switch 1");
-        assert_eq!(ComponentId::Psc(2).to_string(), "PSC 2");
-    }
-}
diff --git a/wicket/src/ui/panes/overview.rs b/wicket/src/ui/panes/overview.rs
index 7de0171e41..b7a04c055d 100644
--- a/wicket/src/ui/panes/overview.rs
+++ b/wicket/src/ui/panes/overview.rs
@@ -343,7 +343,7 @@ impl Control for InventoryView {
         let title_bar = Paragraph::new(Line::from(vec![
             Span::styled("OXIDE RACK / ", border_style),
             Span::styled(
-                state.rack_state.selected.to_string_uppercase(),
+                state.rack_state.selected.to_string(),
                 component_style,
             ),
         ]))
diff --git a/wicket/src/ui/panes/update.rs b/wicket/src/ui/panes/update.rs
index cf6ac255b6..da6f10cf88 100644
--- a/wicket/src/ui/panes/update.rs
+++ b/wicket/src/ui/panes/update.rs
@@ -180,7 +180,7 @@ impl UpdatePane {
             tree_state,
             items: ALL_COMPONENT_IDS
                 .iter()
-                .map(|id| TreeItem::new(id.to_string_uppercase(), vec![]))
+                .map(|id| TreeItem::new(*id, vec![]))
                 .collect(),
             help: vec![
                 ("Expand", "<e>"),
@@ -531,10 +531,7 @@ impl UpdatePane {
     ) {
         let popup_builder = PopupBuilder {
             header: Line::from(vec![Span::styled(
-                format!(
-                    "START UPDATE: {}",
-                    state.rack_state.selected.to_string_uppercase()
-                ),
+                format!("START UPDATE: {}", state.rack_state.selected),
                 style::header(true),
             )]),
             body: Text::from(vec![Line::from(vec![Span::styled(
@@ -564,10 +561,7 @@ impl UpdatePane {
     ) {
         let popup_builder = PopupBuilder {
             header: Line::from(vec![Span::styled(
-                format!(
-                    "START UPDATE: {}",
-                    state.rack_state.selected.to_string_uppercase()
-                ),
+                format!("START UPDATE: {}", state.rack_state.selected),
                 style::header(true),
             )]),
             body: Text::from(vec![Line::from(vec![Span::styled(
@@ -600,10 +594,7 @@ impl UpdatePane {
 
         let popup_builder = PopupBuilder {
             header: Line::from(vec![Span::styled(
-                format!(
-                    "START UPDATE FAILED: {}",
-                    state.rack_state.selected.to_string_uppercase()
-                ),
+                format!("START UPDATE FAILED: {}", state.rack_state.selected),
                 style::failed_update(),
             )]),
             body,
@@ -644,10 +635,7 @@ impl UpdatePane {
 
         let popup_builder = PopupBuilder {
             header: Line::from(vec![Span::styled(
-                format!(
-                    "ABORT UPDATE: {}",
-                    state.rack_state.selected.to_string_uppercase()
-                ),
+                format!("ABORT UPDATE: {}", state.rack_state.selected),
                 style::header(true),
             )]),
             body,
@@ -674,10 +662,7 @@ impl UpdatePane {
     ) {
         let popup_builder = PopupBuilder {
             header: Line::from(vec![Span::styled(
-                format!(
-                    "ABORT UPDATE: {}",
-                    state.rack_state.selected.to_string_uppercase()
-                ),
+                format!("ABORT UPDATE: {}", state.rack_state.selected),
                 style::header(true),
             )]),
             body: Text::from(vec![Line::from(vec![Span::styled(
@@ -710,10 +695,7 @@ impl UpdatePane {
 
         let popup_builder = PopupBuilder {
             header: Line::from(vec![Span::styled(
-                format!(
-                    "ABORT UPDATE FAILED: {}",
-                    state.rack_state.selected.to_string_uppercase()
-                ),
+                format!("ABORT UPDATE FAILED: {}", state.rack_state.selected),
                 style::failed_update(),
             )]),
             body,
@@ -739,10 +721,7 @@ impl UpdatePane {
     ) {
         let popup_builder = PopupBuilder {
             header: Line::from(vec![Span::styled(
-                format!(
-                    "CLEAR UPDATE STATE: {}",
-                    state.rack_state.selected.to_string_uppercase()
-                ),
+                format!("CLEAR UPDATE STATE: {}", state.rack_state.selected),
                 style::header(true),
             )]),
             body: Text::from(vec![Line::from(vec![Span::styled(
@@ -777,7 +756,7 @@ impl UpdatePane {
             header: Line::from(vec![Span::styled(
                 format!(
                     "CLEAR UPDATE STATE FAILED: {}",
-                    state.rack_state.selected.to_string_uppercase()
+                    state.rack_state.selected
                 ),
                 style::failed_update(),
             )]),
@@ -851,7 +830,7 @@ impl UpdatePane {
                         })
                     })
                     .collect();
-                TreeItem::new(id.to_string_uppercase(), children)
+                TreeItem::new(*id, children)
             })
             .collect();
     }
@@ -1128,11 +1107,7 @@ impl UpdatePane {
                     // `overview` pane.
                     let command = self.ignition.selected_command();
                     let selected = state.rack_state.selected;
-                    info!(
-                        self.log,
-                        "Sending {command:?} to {}",
-                        selected.to_string_uppercase()
-                    );
+                    info!(self.log, "Sending {command:?} to {selected}");
                     self.popup = None;
                     Some(Action::Ignition(selected, command))
                 }
@@ -1403,10 +1378,7 @@ impl UpdatePane {
         // Draw the title/tab bar
         let title_bar = Paragraph::new(Line::from(vec![
             Span::styled("UPDATE STATUS / ", border_style),
-            Span::styled(
-                state.rack_state.selected.to_string_uppercase(),
-                header_style,
-            ),
+            Span::styled(state.rack_state.selected.to_string(), header_style),
         ]))
         .block(block.clone());
         frame.render_widget(title_bar, self.title_rect);
diff --git a/wicket/src/ui/widgets/ignition.rs b/wicket/src/ui/widgets/ignition.rs
index cef942d2c7..af0818e52a 100644
--- a/wicket/src/ui/widgets/ignition.rs
+++ b/wicket/src/ui/widgets/ignition.rs
@@ -58,7 +58,7 @@ impl IgnitionPopup {
     ) -> PopupBuilder<'static> {
         PopupBuilder {
             header: Line::from(vec![Span::styled(
-                format!("IGNITION: {}", component.to_string_uppercase()),
+                format!("IGNITION: {}", component),
                 style::header(true),
             )]),
             body: Text {