diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 46d1b1d..3cd9f54 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -20,6 +20,15 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 == Unreleased
 
 
+=== Updated
+
+* Update class names of several components.
+
+** `.icon` has been updated to `.site__icon`.
+** `.list` has been updated to `.site__list`.
+
+
+
 
 
 == [0.6.0] - 2023-03-16
diff --git a/assets/scss/layout.scss b/assets/scss/layout.scss
index e60297d..edc45fe 100644
--- a/assets/scss/layout.scss
+++ b/assets/scss/layout.scss
@@ -18,13 +18,13 @@ footer[aria-label="Site footer"] {
   }
 }
 
-.icon {
+.site__icon {
   height: 1rem;
   width: 1rem;
   fill: currentColor;
 }
 
-.list {
+.site__list {
   display: inline-flex;
   align-items: baseline;
   flex-flow: row wrap;
diff --git a/layouts/partials/components.html b/layouts/partials/components.html
index 1d824cc..1e228ce 100644
--- a/layouts/partials/components.html
+++ b/layouts/partials/components.html
@@ -19,7 +19,7 @@
 {{- define "partials/components/icon.html" }}
   {{- $icon := . }}
   {{- $res := resources.ExecuteAsTemplate (printf $icon.output $icon.id) $icon.id (resources.Get $icon.template) }}
-  <svg class="icon">
+  <svg class="site__icon">
     <use href="{{ $res.Permalink }}#{{ $icon.id }}"></use>
   </svg>
 {{- end }}
diff --git a/layouts/partials/components/post-meta.html b/layouts/partials/components/post-meta.html
index 7791a2a..4d99fcf 100644
--- a/layouts/partials/components/post-meta.html
+++ b/layouts/partials/components/post-meta.html
@@ -3,7 +3,7 @@
 */ -}}
 {{- if or .PublishDate .Lastmod }}
   {{- $RFC3339 := "2006-01-02T15:04:05Z07:00" }}
-  <div class="list post__meta" aria-hidden="true">
+  <div class="site__list post__meta" aria-hidden="true">
     {{- if .PublishDate -}}
     <span class="post__meta-icon-label">
       {{ partial "components/heroicon.html" "calendar" }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index e4abe3e..a8a5997 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -5,7 +5,7 @@
 <!-- Linking to other languages' homepage. -->
 {{ if $.Site.IsMultiLingual }}
   <p>{{ i18n "multilingual" }}:
-  <span class="list site__languages">
+  <span class="site__list site__languages">
   {{ range $.Site.Languages }}
     <a href="{{ . | relURL }}" hreflang="{{ .Lang }}">{{ with .LanguageName }}{{ . }}{{ else }}{{ .Lang }}{{ end }}</a>
   {{ end }}
@@ -16,7 +16,7 @@
 
 <!-- List all of the social media links -->
 {{ with (index $.Site.Data "more-contentful").contacts }}
-<nav class="list site__socials">
+<nav class="site__list site__socials">
   {{ $useImage := index . "useImage" | default false }}
 
   {{ $links := sort .links "id" "asc" }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 6cb0f81..57bff14 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,7 +1,7 @@
 <header aria-label="Site header">
   <nav class="site__nav-header">
     <a class="site__title" href="{{ "" | absLangURL }}">{{ $.Site.Title }}</a>
-    <ul class="list">
+    <ul class="site__list">
       {{ with $.Site.Menus.main }}
         {{ range . -}}
           <li>