diff --git a/.changeset/flat-plants-mate.md b/.changeset/flat-plants-mate.md
new file mode 100644
index 0000000..562f38a
--- /dev/null
+++ b/.changeset/flat-plants-mate.md
@@ -0,0 +1,5 @@
+---
+'@hashicorp/consul-ui-toolkit': major
+---
+
+Rename list-item Label, Label2 to Section, SecondSection
diff --git a/.changeset/hungry-lemons-push.md b/.changeset/hungry-lemons-push.md
new file mode 100644
index 0000000..c5fd2e0
--- /dev/null
+++ b/.changeset/hungry-lemons-push.md
@@ -0,0 +1,5 @@
+---
+'@hashicorp/consul-ui-toolkit': patch
+---
+
+fix: update copy-block cursor to be pointer
diff --git a/documentation/app/components/list-item/index.hbs b/documentation/app/components/list-item/index.hbs
index 6384fb6..8e9163f 100644
--- a/documentation/app/components/list-item/index.hbs
+++ b/documentation/app/components/list-item/index.hbs
@@ -205,8 +205,8 @@
   <Cut::ListItem @href="#" @isHrefExternal={{false}} as |L|>
     <L.Content>
       <Cut::ListItem::Template as |T|>
-        <T.Label as |LB|>
-          <LB.Title>
+        <T.Section as |SC|>
+          <SC.Title>
             <Cut::TextWithIcon
               @text="auth-01"
               @icon="server-cluster"
@@ -222,8 +222,8 @@
               @connection="/"
             />
             <Cut::TextWithIcon @text="default" @icon="users" />
-          </LB.Title>
-          <LB.Metadata>
+          </SC.Title>
+          <SC.Metadata>
             <Hds::Badge
               @text="Allow"
               @color="success"
@@ -232,29 +232,30 @@
             />
             <Cut::TextWithIcon @text="30 seconds ago" @icon="pipeline" />
             <div>10 shared services</div>
-          </LB.Metadata>
-        </T.Label>
+          </SC.Metadata>
+        </T.Section>
       </Cut::ListItem::Template>
     </L.Content>
   </Cut::ListItem>
   <pre><code>
       &lt;Cut::ListItem @onClick=this.onItemClicked as |L|&gt; &lt;L.Content&gt;
-      &lt;Cut::ListItem::Template as |T|&gt; &lt;T.Label as |LB&gt; &lt;LB.Icon
-      @name="check-circle" /&gt; &lt;LB.Title>Service-name&lt;/LB.Title&gt;
-      &lt;LB.Metadata&gt; &lt;Hds::Badge @text="Registered via Vault"
-      @icon="vault" @size="small" /&gt; &lt;div&gt;12 instances&lt;/div&gt;
-      &lt;Cut::TextWithIcon @text="in service mesh with proxy" @icon="mesh"
-      /&gt; &lt;Cut::TextWithIcon @text="kubernetes-api, dev, kube-dev-2"
-      @icon="tag" /&gt; &lt;/LB.Metadata&gt; &lt;/T.Label&gt;
-      &lt;/Cut::ListItem::Template&gt; &lt;/L.Content&gt; &lt;/Cut::ListItem&gt;
+      &lt;Cut::ListItem::Template as |T|&gt; &lt;T.Section as |LB&gt;
+      &lt;SC.Icon @name="check-circle" /&gt;
+      &lt;SC.Title>Service-name&lt;/SC.Title&gt; &lt;SC.Metadata&gt;
+      &lt;Hds::Badge @text="Registered via Vault" @icon="vault" @size="small"
+      /&gt; &lt;div&gt;12 instances&lt;/div&gt; &lt;Cut::TextWithIcon @text="in
+      service mesh with proxy" @icon="mesh" /&gt; &lt;Cut::TextWithIcon
+      @text="kubernetes-api, dev, kube-dev-2" @icon="tag" /&gt;
+      &lt;/SC.Metadata&gt; &lt;/T.Section&gt; &lt;/Cut::ListItem::Template&gt;
+      &lt;/L.Content&gt; &lt;/Cut::ListItem&gt;
     </code></pre>
   <Cut::ListItem as |L|>
     <L.Content>
       <Cut::ListItem::Template as |T|>
-        <T.Label as |LB|>
-          <LB.Icon @name="check-circle" />
-          <LB.Title>Service-name</LB.Title>
-          <LB.Metadata>
+        <T.Section as |SC|>
+          <SC.Icon @name="check-circle" />
+          <SC.Title>Service-name</SC.Title>
+          <SC.Metadata>
             <Hds::Badge
               @text="Registered via Vault"
               @icon="vault"
@@ -271,8 +272,8 @@
               @text="kubernetes-api, dev, kube-dev-2"
               @icon="tag"
             />
-          </LB.Metadata>
-        </T.Label>
+          </SC.Metadata>
+        </T.Section>
       </Cut::ListItem::Template>
     </L.Content>
     <L.ActionDropdown as |dd|>
@@ -286,43 +287,44 @@
   </Cut::ListItem>
   <pre><code>
       &lt;Cut::ListItem as |L|&gt; &lt;L.Content&gt; &lt;Cut::ListItem::Template
-      as |T|&gt; &lt;T.Label as |LB|&gt;
-      &lt;LB.Title&gt;consul-da-server-client-development&lt;/LB.Title&gt;
-      &lt;LB.Metadata&gt; &lt;Cut::TextWithIcon @icon="users"
+      as |T|&gt; &lt;T.Section as |SC|&gt;
+      &lt;SC.Title&gt;consul-da-server-client-development&lt;/SC.Title&gt;
+      &lt;SC.Metadata&gt; &lt;Cut::TextWithIcon @icon="users"
       @text="billing"/&gt; &lt;div&gt;/&lt;/div&gt; &lt;Cut::TextWithIcon
-      @icon="folder" @text="default"/&gt; &lt;/LB.Metadata&gt;
+      @icon="folder" @text="default"/&gt; &lt;/SC.Metadata&gt;
       &lt;/Cut::ListItem::Template&gt; &lt;T.Badge @text="Allow"
-      @color="success" @icon="arrow-right" @size="small"/&gt; &lt;T.Label2 as
-      |LB|&gt;
-      &lt;LB.Title&gt;consul-da-server-client-development&lt;/T.Title&gt;
-      &lt;LB.Metadata&gt; &lt;Cut::TextWithIcon @icon="users"
+      @color="success" @icon="arrow-right" @size="small"/&gt;
+      &lt;T.SecondSection as |SC|&gt;
+      &lt;SC.Title&gt;consul-da-server-client-development&lt;/T.Title&gt;
+      &lt;SC.Metadata&gt; &lt;Cut::TextWithIcon @icon="users"
       @text="billing"/&gt; &lt;div&gt;/&lt;/div&gt; &lt;Cut::TextWithIcon
-      @icon="folder" @text="default"/&gt; &lt;/LB.Metadata&gt; &lt;/T.Label2&gt;
-      &lt;/Cut::ListItem::Template&gt; &lt;/L.Content&gt; &lt;/Cut::ListItem&gt;
+      @icon="folder" @text="default"/&gt; &lt;/SC.Metadata&gt;
+      &lt;/T.SecondSection&gt; &lt;/Cut::ListItem::Template&gt;
+      &lt;/L.Content&gt; &lt;/Cut::ListItem&gt;
     </code></pre>
   <Cut::ListItem as |L|>
     <L.Content>
       <Cut::ListItem::Template as |T|>
-        <T.Label as |LB|>
-          <LB.Title>consul-da-server-client-development</LB.Title>
-          <LB.Metadata>
+        <T.Section as |SC|>
+          <SC.Title>consul-da-server-client-development</SC.Title>
+          <SC.Metadata>
             <Cut::TextWithIcon @icon="users" @text="billing" @connection="/" />
             <Cut::TextWithIcon @icon="folder" @text="default" />
-          </LB.Metadata>
-        </T.Label>
+          </SC.Metadata>
+        </T.Section>
         <T.Badge
           @text="Allow"
           @color="success"
           @icon="arrow-right"
           @size="small"
         />
-        <T.Label2 as |LB|>
-          <LB.Title>consul-da-server-client-development</LB.Title>
-          <LB.Metadata>
+        <T.SecondSection as |SC|>
+          <SC.Title>consul-da-server-client-development</SC.Title>
+          <SC.Metadata>
             <Cut::TextWithIcon @icon="users" @text="billing" @connection="/" />
             <Cut::TextWithIcon @icon="folder" @text="default" />
-          </LB.Metadata>
-        </T.Label2>
+          </SC.Metadata>
+        </T.SecondSection>
       </Cut::ListItem::Template>
     </L.Content>
     <L.ActionDropdown as |dd|>
@@ -337,16 +339,16 @@
   <Cut::ListItem as |L|>
     <L.Content>
       <Cut::ListItem::Template as |T|>
-        <T.Label as |LB|>
-          <LB.Title>Namespace-name</LB.Title>
-          <LB.Metadata>
+        <T.Section as |SC|>
+          <SC.Title>Namespace-name</SC.Title>
+          <SC.Metadata>
             <div>namespace description</div>
             <Cut::TextWithIcon @text="policy-1" @icon="file-text" />
             <Cut::TextWithIcon @text="policy-2" @icon="file-text" />
             <Cut::TextWithIcon @text="role-1" @icon="user" />
             <Cut::TextWithIcon @text="role-2" @icon="user" />
-          </LB.Metadata>
-        </T.Label>
+          </SC.Metadata>
+        </T.Section>
       </Cut::ListItem::Template>
     </L.Content>
     <L.ActionDropdown as |dd|>
@@ -361,17 +363,17 @@
   <Cut::ListItem as |L|>
     <L.Content>
       <Cut::ListItem::Template as |T|>
-        <T.Label as |LB|>
-          <LB.Title>Exposed-path-name</LB.Title>
-          <LB.Metadata>
+        <T.Section as |SC|>
+          <SC.Title>Exposed-path-name</SC.Title>
+          <SC.Metadata>
             <Cut::TextWithIcon @text="grpc" @icon="globe" />
             <Cut::TextWithIcon @text="listening on :63891" @icon="network" />
             <Cut::TextWithIcon
               @text="/expeditabandwidth_overriding_berkshire.xif"
               @icon="path"
             />
-          </LB.Metadata>
-        </T.Label>
+          </SC.Metadata>
+        </T.Section>
       </Cut::ListItem::Template>
     </L.Content>
     <L.ActionDropdown as |dd|>
diff --git a/documentation/app/templates/components/list-item-template.hbs b/documentation/app/templates/components/list-item-template.hbs
index 75d0afa..b4772da 100644
--- a/documentation/app/templates/components/list-item-template.hbs
+++ b/documentation/app/templates/components/list-item-template.hbs
@@ -183,46 +183,46 @@
         <div class="doc-list-item-template-types">
           <p>Large <br />(Desktop)</p>
           <Cut::ListItem::Template as |T|>
-            <T.Label as |Label|>
-              <Label.Icon @name="hexagon" />
-              <Label.Title>Title</Label.Title>
-              <Label.Metadata>
+            <T.Section as |Section|>
+              <Section.Icon @name="hexagon" />
+              <Section.Title>Title</Section.Title>
+              <Section.Metadata>
                 <Cut::TextWithIcon @icon="hexagon" @text="IconLabel" />
                 <Cut::TextWithIcon @icon="hexagon" @text="IconLabel" />
-              </Label.Metadata>
-            </T.Label>
+              </Section.Metadata>
+            </T.Section>
             <T.Badge @icon="hexagon" @text="Default" />
-            <T.Label2 as |Label|>
-              <Label.Icon @name="hexagon" />
-              <Label.Title>Title</Label.Title>
-              <Label.Metadata>
+            <T.SecondSection as |Section|>
+              <Section.Icon @name="hexagon" />
+              <Section.Title>Title</Section.Title>
+              <Section.Metadata>
                 <Cut::TextWithIcon @icon="hexagon" @text="IconLabel" />
                 <Cut::TextWithIcon @icon="hexagon" @text="IconLabel" />
-              </Label.Metadata>
-            </T.Label2>
+              </Section.Metadata>
+            </T.SecondSection>
           </Cut::ListItem::Template>
           <p>Small<br />(Mobile)</p>
           <Cut::ListItem::Template
             class="doc-list-item-template-types_small"
             as |T|
           >
-            <T.Label as |Label|>
-              <Label.Icon @name="hexagon" />
-              <Label.Title>Title</Label.Title>
-              <Label.Metadata>
+            <T.Section as |Section|>
+              <Section.Icon @name="hexagon" />
+              <Section.Title>Title</Section.Title>
+              <Section.Metadata>
                 <Cut::TextWithIcon @icon="hexagon" @text="IconLabel" />
                 <Cut::TextWithIcon @icon="hexagon" @text="IconLabel" />
-              </Label.Metadata>
-            </T.Label>
+              </Section.Metadata>
+            </T.Section>
             <T.Badge @icon="hexagon" @text="Default" />
-            <T.Label2 as |Label|>
-              <Label.Icon @name="hexagon" />
-              <Label.Title>Title</Label.Title>
-              <Label.Metadata>
+            <T.SecondSection as |Section|>
+              <Section.Icon @name="hexagon" />
+              <Section.Title>Title</Section.Title>
+              <Section.Metadata>
                 <Cut::TextWithIcon @icon="hexagon" @text="IconLabel" />
                 <Cut::TextWithIcon @icon="hexagon" @text="IconLabel" />
-              </Label.Metadata>
-            </T.Label2>
+              </Section.Metadata>
+            </T.SecondSection>
           </Cut::ListItem::Template>
         </div>
         <h2 id="component-anatomy">Component anatomy</h2>
@@ -231,15 +231,15 @@
           respective APIs, view the component API section under the code tab.</p>
 
         <h3 id="section">Label</h3>
-        <p>The List Item Template Label is the primary part of the template. It
-          consists of a title, and an optional icon for the title, as well as an
-          area to place metadata like badges, labels, etc. There are two
-          available Labels in the List Item Template. The first is required and
-          is available via the
-          <CodeInline @code="Label" />
-          contextual component. The second Label is optional and can be used via
-          the
-          <CodeInline @code="Label2" />
+        <p>The List Item Template Section is the primary part of the template.
+          It consists of a title, and an optional icon for the title, as well as
+          an area to place metadata like badges, labels, etc. There are two
+          available Sections in the List Item Template. The first is required
+          and is available via the
+          <CodeInline @code="Section" />
+          contextual component. The second Section is optional and can be used
+          via the
+          <CodeInline @code="SecondSection" />
           contextual component.</p>
         <img
           src="/images/list-item-template-section.svg"
@@ -278,7 +278,7 @@
       <InPageNav as |I|>
         <I.Link @section="#type">Type</I.Link>
         <I.Link @section="#component-anatomy">Component anatomy</I.Link>
-        <I.Link @section="#section" @depth={{2}}>Label</I.Link>
+        <I.Link @section="#section" @depth={{2}}>Section</I.Link>
         <I.Link @section="#connection-method" @depth={{2}}>Connection method</I.Link>
       </InPageNav>
     </div>
@@ -288,9 +288,9 @@
       <div class="doc-Page-content">
         <h2 id="how-to-use">How to use this component</h2>
         <p>The List Item Template is composed of several contextual components.
-          Primarily the Label, followed by an optional Badge or Icon and a
-          second Label. The List Item Template will most commonly be used within
-          a
+          Primarily the Section, followed by an optional Badge or Icon and a
+          second Section. The List Item Template will most commonly be used
+          within a
           <Hds::Link::Inline @route="components.list-item">List Item (container)</Hds::Link::Inline>.
           It can also be nested within other components as a template.</p>
 
@@ -300,21 +300,21 @@
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |Label|>
-                      <Label.Icon @name="hexagon" />
-                      <Label.Title>A List Item Template using only the title and
-                        icon</Label.Title>
-                    </T.Label>
+                    <T.Section as |Section|>
+                      <Section.Icon @name="hexagon" />
+                      <Section.Title>A List Item Template using only the title
+                        and icon</Section.Title>
+                    </T.Section>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Example in a List Item</label.Title>
-                      <label.Metadata>
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Example in a List Item</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon
                           @icon="hexagon"
                           @text="Example metadata"
@@ -327,8 +327,8 @@
                           @icon="hexagon"
                           @text="Example metadata"
                         />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
@@ -336,10 +336,10 @@
 
             <div class="doc-list-item-template-div">
               <Cut::ListItem::Template as |T|>
-                <T.Label as |label|>
-                  <label.Icon @name="hexagon" />
-                  <label.Title>Example in a regular div</label.Title>
-                  <label.Metadata>
+                <T.Section as |section|>
+                  <section.Icon @name="hexagon" />
+                  <section.Title>Example in a regular div</section.Title>
+                  <section.Metadata>
                     <Cut::TextWithIcon
                       @icon="hexagon"
                       @text="Example metadata"
@@ -352,8 +352,8 @@
                       @icon="hexagon"
                       @text="Example metadata"
                     />
-                  </label.Metadata>
-                </T.Label>
+                  </section.Metadata>
+                </T.Section>
               </Cut::ListItem::Template>
             </div>
           </P.Preview>
@@ -363,21 +363,21 @@
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |Label|>
-                      <Label.Icon @name="hexagon" />
-                      <Label.Title>A List Item Template using only the title and
-                        icon</Label.Title>
-                    </T.Label>
+                    <T.Section as |Section|>
+                      <Section.Icon @name="hexagon" />
+                      <Section.Title>A List Item Template using only the title and
+                        icon</Section.Title>
+                    </T.Section>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Example in a List Item</label.Title>
-                      <label.Metadata>
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Example in a List Item</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon
                           @icon="hexagon"
                           @text="Example metadata"
@@ -390,18 +390,18 @@
                           @icon="hexagon"
                           @text="Example metadata"
                         />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
             </ul>
             <div class="doc-list-item-template-div">
               <Cut::ListItem::Template as |T|>
-                <T.Label as |label|>
-                  <label.Icon @name="hexagon" />
-                  <label.Title>Example in a regular div</label.Title>
-                  <label.Metadata>
+                <T.Section as |section|>
+                  <section.Icon @name="hexagon" />
+                  <section.Title>Example in a regular div</section.Title>
+                  <section.Metadata>
                     <Cut::TextWithIcon
                       @icon="hexagon"
                       @text="Example metadata"
@@ -414,17 +414,17 @@
                       @icon="hexagon"
                       @text="Example metadata"
                     />
-                  </label.Metadata>
-                </T.Label>
+                  </section.Metadata>
+                </T.Section>
               </Cut::ListItem::Template>
             </div>
           '}}}
           />
         </PreviewBlock>
 
-        <h3 id="multiple-labels">Multiple labels</h3>
+        <h3 id="multiple-sections">Multiple sections</h3>
         <p>You can apply a second label by using the
-          <CodeInline @code="Label2" />
+          <CodeInline @code="SecondSection" />
           contextual component and either a
           <CodeInline @code="Badge" />
           or a
@@ -436,48 +436,48 @@
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 1</label.Title>
-                      <label.Metadata>
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 1</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 1" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 2" />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                     <T.Badge @text="Default badge" />
-                    <T.Label2 as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 2</label.Title>
-                      <label.Metadata>
+                    <T.SecondSection as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 2</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 3" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 4" />
-                      </label.Metadata>
-                    </T.Label2>
+                      </section.Metadata>
+                    </T.SecondSection>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 1</label.Title>
-                      <label.Metadata>
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 1</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 1" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 2" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 3" />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                     <T.Icon @name="arrow-right" />
-                    <T.Label2 as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 2</label.Title>
-                      <label.Metadata>
+                    <T.SecondSection as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 2</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 4" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 5" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 6" />
-                      </label.Metadata>
-                    </T.Label2>
+                      </section.Metadata>
+                    </T.SecondSection>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
@@ -489,48 +489,48 @@
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 1</label.Title>
-                      <label.Metadata>
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 1</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 1" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 2" />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                     <T.Badge @text="Default badge" />
-                    <T.Label2 as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 2</label.Title>
-                      <label.Metadata>
+                    <T.SecondSection as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 2</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 3" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 4" />
-                      </label.Metadata>
-                    </T.Label2>
+                      </section.Metadata>
+                    </T.SecondSection>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 1</label.Title>
-                      <label.Metadata>
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 1</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 1" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 2" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 3" />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                     <T.Icon @name="arrow-right" />
-                    <T.Label2 as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 2</label.Title>
-                      <label.Metadata>
+                    <T.SecondSection as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 2</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 4" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 5" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 6" />
-                      </label.Metadata>
-                    </T.Label2>
+                      </section.Metadata>
+                    </T.SecondSection>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
@@ -557,56 +557,56 @@
                   }}
                 >
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Title</label.Title>
-                      <label.Metadata>
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Title</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Icon Label" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Icon Label" />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                     <T.Badge @text="Default" @icon="hexagon" />
-                    <T.Label2 as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 2</label.Title>
-                      <label.Metadata>
+                    <T.SecondSection as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 2</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 3" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 4" />
-                      </label.Metadata>
-                    </T.Label2>
+                      </section.Metadata>
+                    </T.SecondSection>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title
                         {{hds-tooltip "This tooltip is on the title text"}}
-                      >Title</label.Title>
-                      <label.Metadata>
+                      >Title</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Icon Label" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Icon Label" />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                     <T.Badge
                       @text="Default"
                       @icon="hexagon"
                       {{hds-tooltip "This tooltip is on the badge seperator"}}
                     />
-                    <T.Label2 as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 2</label.Title>
-                      <label.Metadata>
+                    <T.SecondSection as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 2</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 3" />
                         <Cut::TextWithIcon
                           @icon="hexagon"
                           @text="Metadata 4"
                           {{hds-tooltip "This tooltip is on the metadata"}}
                         />
-                      </label.Metadata>
-                    </T.Label2>
+                      </section.Metadata>
+                    </T.SecondSection>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
@@ -622,56 +622,56 @@
                   }}
                 >
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Title</label.Title>
-                      <label.Metadata>
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Title</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Icon Label" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Icon Label" />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                     <T.Badge @text="Default" @icon="hexagon" />
-                    <T.Label2 as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 2</label.Title>
-                      <label.Metadata>
+                    <T.SecondSection as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 2</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 3" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 4" />
-                      </label.Metadata>
-                    </T.Label2>
+                      </section.Metadata>
+                    </T.SecondSection>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
               <Cut::ListItem as |L|>
                 <L.Content>
                   <Cut::ListItem::Template as |T|>
-                    <T.Label as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title
+                    <T.Section as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title
                         {{hds-tooltip "This tooltip is on the title text"}}
-                      >Title</label.Title>
-                      <label.Metadata>
+                      >Title</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Icon Label" />
                         <Cut::TextWithIcon @icon="hexagon" @text="Icon Label" />
-                      </label.Metadata>
-                    </T.Label>
+                      </section.Metadata>
+                    </T.Section>
                     <T.Badge
                       @text="Default"
                       @icon="hexagon"
                       {{hds-tooltip "This tooltip is on the badge seperator"}}
                     />
-                    <T.Label2 as |label|>
-                      <label.Icon @name="hexagon" />
-                      <label.Title>Label 2</label.Title>
-                      <label.Metadata>
+                    <T.SecondSection as |section|>
+                      <section.Icon @name="hexagon" />
+                      <section.Title>Section 2</section.Title>
+                      <section.Metadata>
                         <Cut::TextWithIcon @icon="hexagon" @text="Metadata 3" />
                         <Cut::TextWithIcon
                           @icon="hexagon"
                           @text="Metadata 4"
                           {{hds-tooltip "This tooltip is on the metadata"}}
                         />
-                      </label.Metadata>
-                    </T.Label2>
+                      </section.Metadata>
+                    </T.SecondSection>
                   </Cut::ListItem::Template>
                 </L.Content>
               </Cut::ListItem>
@@ -691,12 +691,12 @@
             <Cut::ListItem as |L|>
               <L.Content>
                 <Cut::ListItem::Template as |T|>
-                  <T.Label as |LB|>
-                    <LB.Icon @name="check-circle" />
-                    <LB.Title><Cut::CopyBlock
+                  <T.Section as |SC|>
+                    <SC.Icon @name="check-circle" />
+                    <SC.Title><Cut::CopyBlock
                         @clipboardText="service-name"
-                      >service-name</Cut::CopyBlock></LB.Title>
-                    <LB.Metadata>
+                      >service-name</Cut::CopyBlock></SC.Title>
+                    <SC.Metadata>
                       <Hds::Badge
                         @text="Registered via Vault"
                         @icon="vault"
@@ -713,8 +713,8 @@
                         @text="kubernetes-api, kube"
                         @icon="tag"
                       />
-                    </LB.Metadata>
-                  </T.Label>
+                    </SC.Metadata>
+                  </T.Section>
                 </Cut::ListItem::Template>
               </L.Content>
             </Cut::ListItem>
@@ -724,12 +724,12 @@
             <Cut::ListItem as |L|>
               <L.Content>
                 <Cut::ListItem::Template as |T|>
-                  <T.Label as |LB|>
-                    <LB.Icon @name="check-circle" />
-                    <LB.Title><Cut::CopyBlock
+                  <T.Section as |SC|>
+                    <SC.Icon @name="check-circle" />
+                    <SC.Title><Cut::CopyBlock
                         @clipboardText="service-name"
-                      >service-name</Cut::CopyBlock></LB.Title>
-                    <LB.Metadata>
+                      >service-name</Cut::CopyBlock></SC.Title>
+                    <SC.Metadata>
                       <Hds::Badge
                         @text="Registered via Vault"
                         @icon="vault"
@@ -746,8 +746,8 @@
                         @text="kubernetes-api, kube"
                         @icon="tag"
                       />
-                    </LB.Metadata>
-                  </T.Label>
+                    </SC.Metadata>
+                  </T.Section>
                 </Cut::ListItem::Template>
               </L.Content>
             </Cut::ListItem>
@@ -758,12 +758,12 @@
         <h2 id="component-api">Component API</h2>
         <p>The List Item Template yields a few different contextual components.
           Primarily it provides a
-          <CodeInline @code="Label" />
+          <CodeInline @code="Section" />
           component to present the main content and an optional second
-          <CodeInline @code="Label" />
+          <CodeInline @code="Section" />
           in the form of
-          <CodeInline @code="Label2" />. It also offers optional seperators in
-          via the
+          <CodeInline @code="SecondSection" />. It also offers optional
+          seperators in via the
           <CodeInline @code="Badge" />
           and
           <CodeInline @code="Icon" />
@@ -775,13 +775,13 @@
           <CodeInline @code="...attributes" />
         </ComponentApi>
 
-        <h3 id="label">Label</h3>
-        <p>The List Item Template Label is the primary part of the template. It
-          consists of a title, as well as an option icon for the title and a
+        <h3 id="section-api">Section</h3>
+        <p>The List Item Template Section is the primary part of the template.
+          It consists of a title, as well as an option icon for the title and a
           section to place metadata like badges, labels, etc. There are two
-          available Labels in the List Item Template. The first is required and
-          is available via the Label contextual component. The optional second
-          section can be used via the Label2 contextual component.</p>
+          available Sections in the List Item Template. The first is required
+          and is available via the Label contextual component. The optional
+          second section can be used via the SecondSection contextual component.</p>
         <ComponentApi @name="Icon">
           The
           <CodeInline @code="Icon" />
@@ -799,7 +799,7 @@
           The
           <CodeInline @code="Title" />
           is a contextual component that yields a slot for the title portion of
-          the List Item Label. You may place any content you wish into this
+          the List Item Section. You may place any content you wish into this
           block. The most common usage is text for the title.
         </ComponentApi>
 
@@ -807,25 +807,25 @@
           The
           <CodeInline @code="Metadata" />
           contextual component yields a slot for any metadata for the List Item
-          Template's Label. While this component doesn't prescribe what that
+          Template's Section. While this component doesn't prescribe what that
           content should be, it is often used for
           <CodeInline @code="<Hds::Badge />" />,
           <CodeInline @code="<Cut::TextWithIcon />" />,
           <CodeInline @code="<Cut::CopyBlock />" />, etc.
         </ComponentApi>
 
-        <h3 id="label2">Label2</h3>
-        <p><CodeInline @code="Label2" />
+        <h3 id="section2">SecondSection</h3>
+        <p><CodeInline @code="SecondSection" />
           is the second option
-          <CodeInline @code="Label" />
+          <CodeInline @code="Section" />
           that is yielded by the List Item Template. It is an optional component
           and shares the exact same API as the
-          <CodeInline @code="Label" />.</p>
+          <CodeInline @code="Section" />.</p>
         <h3 id="badge">Badge</h3>
         <p>The
           <CodeInline @code="Badge" />
           contextual component is used as an optional separator between the two
-          <CodeInline @code="Labels" />. It renders a
+          <CodeInline @code="Sections" />. It renders a
           <CodeInline @code="<Hds::Badge />" />
           from HDS. Therefore, it shares the same API. Reference the
           <Hds::Link::Inline
@@ -836,7 +836,7 @@
         <p>The
           <CodeInline @code="Icon" />
           contextual component is used as an optional separator between the two
-          <CodeInline @code="Labels" />. It renders a
+          <CodeInline @code="Sections" />. It renders a
           <CodeInline @code="<FlightIcon />" />
           from HDS. Therefore it shares the same API. Reference the
           <Hds::Link::Inline
@@ -847,12 +847,12 @@
       </div>
       <InPageNav as |I|>
         <I.Link @section="#how-to-use">How to use</I.Link>
-        <I.Link @section="#multiple-labels" @depth={{2}}>Multiple labels</I.Link>
+        <I.Link @section="#multiple-sections" @depth={{2}}>Multiple sections</I.Link>
         <I.Link @section="#using-tooltips" @depth={{2}}>Tooltips</I.Link>
         <I.Link @section="#interactivity" @depth={{2}}>Interactivity</I.Link>
         <I.Link @section="#component-api">Component API</I.Link>
-        <I.Link @section="#label" @depth={{2}}>Label</I.Link>
-        <I.Link @section="#label2" @depth={{2}}>Label2</I.Link>
+        <I.Link @section="#section-api" @depth={{2}}>Section</I.Link>
+        <I.Link @section="#section2" @depth={{2}}>SecondSection</I.Link>
         <I.Link @section="#badge" @depth={{2}}>Badge</I.Link>
         <I.Link @section="#icon" @depth={{2}}>Icon</I.Link>
       </InPageNav>
diff --git a/documentation/tests/integration/components/list-item-test.js b/documentation/tests/integration/components/list-item-test.js
index d65dc0a..7107c43 100644
--- a/documentation/tests/integration/components/list-item-test.js
+++ b/documentation/tests/integration/components/list-item-test.js
@@ -122,7 +122,7 @@ module('Integration | Component | cut/list-item', function (hooks) {
     await render(
       hbs`
         <Cut::ListItem::Template id="test-list-item-template" as |T|>
-          <T.Label id="test-list-item-template-label"></T.Label>
+          <T.Section id="test-list-item-template-label"></T.Section>
         </Cut::ListItem::Template>`
     );
     assert
@@ -155,29 +155,33 @@ module('Integration | Component | cut/list-item', function (hooks) {
       .hasText('test');
   });
 
-  test('it should have Cut::ListItem::Label with yielded Title component', async function (assert) {
+  test('it should have Cut::ListItem::Section with yielded Title component', async function (assert) {
     await render(
       hbs`
-        <Cut::ListItem::Label id="test-list-item-label" as |L|>
-          <L.Title id="test-list-item-label-title">test</L.Title>
-        </Cut::ListItem::Label>`
+        <Cut::ListItem::Section id="test-list-item-section" as |L|>
+          <L.Title id="test-list-item-section-title">test</L.Title>
+        </Cut::ListItem::Section>`
     );
-    assert.dom('#test-list-item-label #test-list-item-label-title').exists();
     assert
-      .dom('#test-list-item-label #test-list-item-label-title')
+      .dom('#test-list-item-section #test-list-item-section-title')
+      .exists();
+    assert
+      .dom('#test-list-item-section #test-list-item-section-title')
       .hasText('test');
   });
 
-  test('it should have Cut::ListItem::Label with yielded Metadata component', async function (assert) {
+  test('it should have Cut::ListItem::Section with yielded Metadata component', async function (assert) {
     await render(
       hbs`
-        <Cut::ListItem::Label id="test-list-item-label" as |L|>
-          <L.Metadata id="test-list-item-label-metadata">test</L.Metadata>
-        </Cut::ListItem::Label>`
+        <Cut::ListItem::Section id="test-list-item-section" as |L|>
+          <L.Metadata id="test-list-item-section-metadata">test</L.Metadata>
+        </Cut::ListItem::Section>`
     );
-    assert.dom('#test-list-item-label #test-list-item-label-metadata').exists();
     assert
-      .dom('#test-list-item-label #test-list-item-label-metadata')
+      .dom('#test-list-item-section #test-list-item-section-metadata')
+      .exists();
+    assert
+      .dom('#test-list-item-section #test-list-item-section-metadata')
       .hasText('test');
   });
 });
diff --git a/toolkit/package.json b/toolkit/package.json
index cac2161..b7f2f0b 100644
--- a/toolkit/package.json
+++ b/toolkit/package.json
@@ -83,9 +83,9 @@
       "./components/cut/list-item/action-generic.js": "./dist/_app_/components/cut/list-item/action-generic.js",
       "./components/cut/list-item/content.js": "./dist/_app_/components/cut/list-item/content.js",
       "./components/cut/list-item/index.js": "./dist/_app_/components/cut/list-item/index.js",
-      "./components/cut/list-item/label/index.js": "./dist/_app_/components/cut/list-item/label/index.js",
-      "./components/cut/list-item/label/metadata.js": "./dist/_app_/components/cut/list-item/label/metadata.js",
-      "./components/cut/list-item/label/title.js": "./dist/_app_/components/cut/list-item/label/title.js",
+      "./components/cut/list-item/section/index.js": "./dist/_app_/components/cut/list-item/section/index.js",
+      "./components/cut/list-item/section/metadata.js": "./dist/_app_/components/cut/list-item/section/metadata.js",
+      "./components/cut/list-item/section/title.js": "./dist/_app_/components/cut/list-item/section/title.js",
       "./components/cut/list-item/service-instance/index.js": "./dist/_app_/components/cut/list-item/service-instance/index.js",
       "./components/cut/list-item/service/index.js": "./dist/_app_/components/cut/list-item/service/index.js",
       "./components/cut/list-item/template/index.js": "./dist/_app_/components/cut/list-item/template/index.js",
diff --git a/toolkit/src/components/cut/list-item/label/index.hbs b/toolkit/src/components/cut/list-item/label/index.hbs
deleted file mode 100644
index 5031e8c..0000000
--- a/toolkit/src/components/cut/list-item/label/index.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-}}
-
-<div class="cut-list-item-label" ...attributes>
-  <div class="cut-list-item-label__title-row">
-    {{yield (hash Icon=(component 'flight-icon' size="16"))}}
-    {{yield (hash Title=(component 'cut/list-item/label/title'))}}
-  </div>
-  {{yield (hash Metadata=(component 'cut/list-item/label/metadata'))}}
-</div>
\ No newline at end of file
diff --git a/toolkit/src/components/cut/list-item/label/metadata.hbs b/toolkit/src/components/cut/list-item/label/metadata.hbs
deleted file mode 100644
index 6c0f25f..0000000
--- a/toolkit/src/components/cut/list-item/label/metadata.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-}}
-
-<div class="cut-list-item-label__metadata hds-typography-body-200 hds-font-weight-regular" ...attributes>{{yield}}</div>
diff --git a/toolkit/src/components/cut/list-item/label/title.hbs b/toolkit/src/components/cut/list-item/label/title.hbs
deleted file mode 100644
index 3e1915a..0000000
--- a/toolkit/src/components/cut/list-item/label/title.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{!
-  Copyright (c) HashiCorp, Inc.
-}}
-
-<div class="cut-list-item-label__title hds-typography-body-300 hds-font-weight-semibold" ...attributes>{{yield}}</div>
diff --git a/toolkit/src/components/cut/list-item/section/index.hbs b/toolkit/src/components/cut/list-item/section/index.hbs
new file mode 100644
index 0000000..d990f21
--- /dev/null
+++ b/toolkit/src/components/cut/list-item/section/index.hbs
@@ -0,0 +1,11 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+}}
+
+<div class='cut-list-item-section' ...attributes>
+  <div class='cut-list-item-section__title-row'>
+    {{yield (hash Icon=(component 'flight-icon' size='16'))}}
+    {{yield (hash Title=(component 'cut/list-item/section/title'))}}
+  </div>
+  {{yield (hash Metadata=(component 'cut/list-item/section/metadata'))}}
+</div>
\ No newline at end of file
diff --git a/toolkit/src/components/cut/list-item/section/metadata.hbs b/toolkit/src/components/cut/list-item/section/metadata.hbs
new file mode 100644
index 0000000..b7b4984
--- /dev/null
+++ b/toolkit/src/components/cut/list-item/section/metadata.hbs
@@ -0,0 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+}}
+
+<div
+  class='cut-list-item-section__metadata hds-typography-body-200 hds-font-weight-regular'
+  ...attributes
+>{{yield}}</div>
\ No newline at end of file
diff --git a/toolkit/src/components/cut/list-item/section/title.hbs b/toolkit/src/components/cut/list-item/section/title.hbs
new file mode 100644
index 0000000..13bb149
--- /dev/null
+++ b/toolkit/src/components/cut/list-item/section/title.hbs
@@ -0,0 +1,8 @@
+{{!
+  Copyright (c) HashiCorp, Inc.
+}}
+
+<div
+  class='cut-list-item-section__title hds-typography-body-300 hds-font-weight-semibold'
+  ...attributes
+>{{yield}}</div>
\ No newline at end of file
diff --git a/toolkit/src/components/cut/list-item/service-instance/index.hbs b/toolkit/src/components/cut/list-item/service-instance/index.hbs
index 9b96eee..20d04cc 100644
--- a/toolkit/src/components/cut/list-item/service-instance/index.hbs
+++ b/toolkit/src/components/cut/list-item/service-instance/index.hbs
@@ -11,18 +11,19 @@
   @replace={{@replace}}
   @onClick={{@onClick}}
   data-test-service-instance-list-item
-  as |L|>
+  as |L|
+>
   <L.Content as |C|>
     <Cut::ListItem::Template as |T|>
-      <T.Label as |LB|>
-        <LB.Title data-test-service-name>{{@service.name}}</LB.Title>
-        <LB.Metadata>
+      <T.Section as |SC|>
+        <SC.Title data-test-service-name>{{@service.name}}</SC.Title>
+        <SC.Metadata>
           {{#if this.isAllHealthy}}
             <Hds::Badge
               @color='success'
               @icon='check'
               @text='Healthy'
-              @size="small"
+              @size='small'
               data-test-health-check-all-healthy
             />
           {{else}}
@@ -32,7 +33,7 @@
                 @successCount={{@service.metadata.healthCheck.service.success}}
                 @warningCount={{@service.metadata.healthCheck.service.warning}}
                 @criticalCount={{@service.metadata.healthCheck.service.critical}}
-                @type="service"
+                @type='service'
               />
             {{/if}}
             <!--Node health check-->
@@ -41,7 +42,7 @@
                 @successCount={{@service.metadata.healthCheck.node.success}}
                 @warningCount={{@service.metadata.healthCheck.node.warning}}
                 @criticalCount={{@service.metadata.healthCheck.node.critical}}
-                @type="node"
+                @type='node'
               />
             {{/if}}
           {{/if}}
@@ -51,25 +52,39 @@
           />
 
           {{#if @service.metadata.externalSource}}
-            <Cut::Metadata::ExternalSource @externalSource={{@service.metadata.externalSource}}/>
+            <Cut::Metadata::ExternalSource
+              @externalSource={{@service.metadata.externalSource}}
+            />
           {{/if}}
 
           {{#if @service.metadata.node}}
-            <Cut::TextWithIcon @icon="node" @text={{@service.metadata.node}} data-test-node-name/>
+            <Cut::TextWithIcon
+              @icon='node'
+              @text={{@service.metadata.node}}
+              data-test-node-name
+            />
           {{/if}}
 
           {{#if @service.metadata.servicePortAddress}}
-            <Cut::TextWithIcon @icon="globe" @text={{@service.metadata.servicePortAddress}} data-test-address/>
+            <Cut::TextWithIcon
+              @icon='globe'
+              @text={{@service.metadata.servicePortAddress}}
+              data-test-address
+            />
 
           {{else if @service.metadata.serviceSocketPath}}
-            <Cut::TextWithIcon @icon="socket" @text={{@service.metadata.serviceSocketPath}} data-test-socket />
+            <Cut::TextWithIcon
+              @icon='socket'
+              @text={{@service.metadata.serviceSocketPath}}
+              data-test-socket
+            />
           {{/if}}
 
           {{#if @service.metadata.tags.length}}
-            <Cut::Metadata::Tags @tags={{@service.metadata.tags}}/>
+            <Cut::Metadata::Tags @tags={{@service.metadata.tags}} />
           {{/if}}
-        </LB.Metadata>
-      </T.Label>
+        </SC.Metadata>
+      </T.Section>
     </Cut::ListItem::Template>
   </L.Content>
 </Cut::ListItem>
\ No newline at end of file
diff --git a/toolkit/src/components/cut/list-item/service/index.hbs b/toolkit/src/components/cut/list-item/service/index.hbs
index 12413c0..16b418f 100644
--- a/toolkit/src/components/cut/list-item/service/index.hbs
+++ b/toolkit/src/components/cut/list-item/service/index.hbs
@@ -11,18 +11,19 @@
   @replace={{@replace}}
   @onClick={{@onClick}}
   data-test-service-list-item
-  as |L|>
+  as |L|
+>
   <L.Content as |C|>
     <Cut::ListItem::Template as |T|>
-      <T.Label as |LB|>
-        <LB.Title data-test-service-name>{{@service.name}}</LB.Title>
-        <LB.Metadata>
+      <T.Section as |SC|>
+        <SC.Title data-test-service-name>{{@service.name}}</SC.Title>
+        <SC.Metadata>
           {{#if this.isAllHealthy}}
             <Hds::Badge
               @color='success'
               @icon='check'
               @text='Healthy'
-              @size="small"
+              @size='small'
               data-test-health-check-all-healthy
             />
           {{else}}
@@ -32,54 +33,76 @@
                 @successCount={{@service.metadata.healthCheck.instance.success}}
                 @warningCount={{@service.metadata.healthCheck.instance.warning}}
                 @criticalCount={{@service.metadata.healthCheck.instance.critical}}
-                @type="instance"
+                @type='instance'
               />
             {{/if}}
           {{/if}}
           {{#if @service.metadata.kind}}
-            <Cut::TextWithIcon @icon="gateway" @text={{this.kindName}}
+            <Cut::TextWithIcon
+              @icon='gateway'
+              @text={{this.kindName}}
               data-test-service-kind
             />
           {{/if}}
           {{#if this.isIngressGateway}}
             {{#if (not-eq @service.metadata.upstreamCount undefined)}}
               <!-- TODO: add translate with pluralize(CC-5314)-->
-              <span data-test-associated-upstream-count>{{@service.metadata.upstreamCount}} upstreams</span>
+              <span
+                data-test-associated-upstream-count
+              >{{@service.metadata.upstreamCount}} upstreams</span>
             {{/if}}
           {{else if this.isTerminatingGateway}}
             {{#if (not-eq @service.metadata.linkedServiceCount undefined)}}
               <!-- TODO: add translate with pluralize (CC-5314) -->
-              <span data-test-associated-service-count>{{@service.metadata.linkedServiceCount}} linked services</span>
+              <span
+                data-test-associated-service-count
+              >{{@service.metadata.linkedServiceCount}} linked services</span>
             {{/if}}
           {{else}}
             {{#if (not-eq @service.metadata.instanceCount undefined)}}
               <!-- TODO: add translate with pluralize(CC-5314) -->
-              <span data-test-associated-instance-count>{{@service.metadata.instanceCount}} instances</span>
+              <span
+                data-test-associated-instance-count
+              >{{@service.metadata.instanceCount}} instances</span>
             {{/if}}
           {{/if}}
           {{#if @service.metadata.isPermissiveMTls}}
             <!-- TODO: add translate(CC-5314) -->
-            <Cut::TextWithIcon @icon="unlock" @text="permissive mTLS" data-test-permissive-mtls/>
+            <Cut::TextWithIcon
+              @icon='unlock'
+              @text='permissive mTLS'
+              data-test-permissive-mtls
+            />
           {{/if}}
           <Cut::Metadata::InServiceMesh
             @connectedWithGateway={{@service.metadata.connectedWithGateway}}
             @connectedWithProxy={{@service.metadata.connectedWithProxy}}
           />
           {{#if @service.metadata.samenessGroup}}
-            <Cut::TextWithIcon @icon="collections" @text={{@service.metadata.samenessGroup}} data-test-sameness-group/>
+            <Cut::TextWithIcon
+              @icon='collections'
+              @text={{@service.metadata.samenessGroup}}
+              data-test-sameness-group
+            />
           {{/if}}
           {{#if @service.metadata.isImported}}
             <!-- TODO: add translate(CC-5314) -->
-            <Cut::TextWithIcon @icon="upload" @text="Imported" data-test-imported/>
+            <Cut::TextWithIcon
+              @icon='upload'
+              @text='Imported'
+              data-test-imported
+            />
           {{/if}}
           {{#if @service.metadata.externalSource}}
-            <Cut::Metadata::ExternalSource @externalSource={{@service.metadata.externalSource}}/>
+            <Cut::Metadata::ExternalSource
+              @externalSource={{@service.metadata.externalSource}}
+            />
           {{/if}}
           {{#if @service.metadata.tags.length}}
-            <Cut::Metadata::Tags @tags={{@service.metadata.tags}}/>
+            <Cut::Metadata::Tags @tags={{@service.metadata.tags}} />
           {{/if}}
-        </LB.Metadata>
-      </T.Label>
+        </SC.Metadata>
+      </T.Section>
     </Cut::ListItem::Template>
   </L.Content>
 </Cut::ListItem>
\ No newline at end of file
diff --git a/toolkit/src/components/cut/list-item/template/index.hbs b/toolkit/src/components/cut/list-item/template/index.hbs
index 0e93bc0..5273e67 100644
--- a/toolkit/src/components/cut/list-item/template/index.hbs
+++ b/toolkit/src/components/cut/list-item/template/index.hbs
@@ -2,14 +2,15 @@
   Copyright (c) HashiCorp, Inc.
 }}
 
-<div class="cut-list-item-template" ...attributes>
-  {{yield (hash Label=(component 'cut/list-item/label'))}}
+<div class='cut-list-item-template' ...attributes>
+  {{yield (hash Section=(component 'cut/list-item/section'))}}
   <div>
-    {{yield (hash
-              Badge=(component 'hds/badge' size='small')
-              Icon=(component "flight-icon" size=16)
-            )
+    {{yield
+      (hash
+        Badge=(component 'hds/badge' size='small')
+        Icon=(component 'flight-icon' size=16)
+      )
     }}
   </div>
-  {{yield (hash Label2=(component 'cut/list-item/label'))}}
+  {{yield (hash SecondSection=(component 'cut/list-item/section'))}}
 </div>
\ No newline at end of file
diff --git a/toolkit/src/styles/components/copy-block.scss b/toolkit/src/styles/components/copy-block.scss
index b3d5616..1c46c43 100644
--- a/toolkit/src/styles/components/copy-block.scss
+++ b/toolkit/src/styles/components/copy-block.scss
@@ -9,12 +9,14 @@
   gap: 2px;
   padding-left: 4px;
   margin-left: -4px;
+  cursor: pointer;
 
   .cut-copy-block__copy-button {
     opacity: 0;
     & > .copy-btn {
       display: flex;
       align-items: center;
+      cursor: pointer;
     }
   }
 
@@ -43,4 +45,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/toolkit/src/styles/components/list-item.scss b/toolkit/src/styles/components/list-item.scss
index 9b6f950..6c43684 100644
--- a/toolkit/src/styles/components/list-item.scss
+++ b/toolkit/src/styles/components/list-item.scss
@@ -70,7 +70,7 @@ button.cut-list-item__content-container {
   gap: 16px;
 }
 
-.cut-list-item-label {
+.cut-list-item-section {
   display: flex;
   flex-direction: column;
   gap: 10px;
@@ -83,14 +83,14 @@ button.cut-list-item__content-container {
   }
 }
 
-.cut-list-item-label__title {
+.cut-list-item-section__title {
   display: flex;
   gap: 8px;
   align-items: center;
   flex-wrap: wrap;
 }
 
-.cut-list-item-label__metadata {
+.cut-list-item-section__metadata {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;