diff --git a/_includes/nav.html b/_includes/nav.html
index a2fda5915f774c2f02f98890003bd26c87aa83ad..d064b4887b2fcaef37737069b4a040458ee06aaf 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -8,7 +8,7 @@
             {%- assign first_level_url = node.url | absolute_url -%}
           {%- endif -%}
           {%- if node.has_children -%}
-            <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#arrow-right"></use></svg></a>
+            <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
           {%- endif -%}
           <a href="{{ node.url | absolute_url }}" class="nav-list-link{% if page.url == node.url %} active{% endif %}">{{ node.title }}</a>
           {%- if node.has_children -%}
@@ -20,7 +20,7 @@
                   {%- assign second_level_url = child.url | absolute_url -%}
                 {%- endif -%}
                 {%- if child.has_children -%}
-                  <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#arrow-right"></use></svg></a>
+                  <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
                 {%- endif -%}
                 <a href="{{ child.url | absolute_url }}" class="nav-list-link{% if page.url == child.url %} active{% endif %}">{{ child.title }}</a>
                 {%- if child.has_children -%}
diff --git a/_layouts/default.html b/_layouts/default.html
index c6fd1281500a2630190cc4f90e5402e3f127cfc8..bc4ee2799670daddd71ebeb86dd426ab2d4f6fb5 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -8,19 +8,19 @@ layout: table_wrappers
 {% include head.html %}
 <body>
   <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
-    <symbol id="link" viewBox="0 0 16 16">
+    <symbol id="svg-link" viewBox="0 0 16 16">
       <title>Link</title>
       <path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path>
     </symbol>
-    <symbol id="search" viewBox="0 0 24 24">
+    <symbol id="svg-search" viewBox="0 0 24 24">
       <title>Menu</title>
       <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/>
     </symbol>
-    <symbol id="menu" viewBox="0 0 24 24">
+    <symbol id="svg-menu" viewBox="0 0 24 24">
       <title>Search</title>
       <path d="M0 0h24v24H0z" fill="none"/><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/>
     </symbol>
-    <symbol id="arrow-right" viewBox="0 0 24 24">
+    <symbol id="svg-arrow-right" viewBox="0 0 24 24">
       <title>Expand</title>
       <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/><path d="M0 0h24v24H0z" fill="none"/>
     </symbol>
@@ -30,7 +30,7 @@ layout: table_wrappers
     <div class="site-header">
       <a href="{{ '/' | absolute_url }}" class="site-title lh-tight">{% include title.html %}</a>
       <a href="#" id="menu-button" class="site-button">
-        <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#menu"></use></svg>
+        <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#svg-menu"></use></svg>
       </a>
     </div>
     <nav role="navigation" aria-label="Main" id="site-nav" class="site-nav">
@@ -46,7 +46,7 @@ layout: table_wrappers
         <div class="search">
           <div class="search-input-wrap">
             <input type="text" id="search-input" class="search-input" tabindex="0" placeholder="Search {{ site.title }}" aria-label="Search {{ site.title }}" autocomplete="off">
-            <svg viewBox="0 0 24 24" class="search-icon"><use xlink:href="#search"></use></svg>
+            <svg viewBox="0 0 24 24" class="search-icon"><use xlink:href="#svg-search"></use></svg>
           </div>
           <div id="search-results" class="search-results"></div>
         </div>
@@ -79,7 +79,7 @@ layout: table_wrappers
       {% endunless %}
       <div id="main-content" class="main-content" role="main">
         {% if site.heading_anchors != false %}
-          {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#link\"></use></svg>" anchorClass="anchor-heading" %}
+          {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#svg-link\"></use></svg>" anchorClass="anchor-heading" %}
         {% else %}
           {{ content }}
         {% endif %}
@@ -112,7 +112,7 @@ layout: table_wrappers
 
   {% if site.search_enabled != false %}
     <a href="#" id="search-button" class="search-button">
-      <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#search"></use></svg>
+      <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#svg-search"></use></svg>
     </a>
   {% endif %}