diff --git a/district/templates/district/base.html b/district/templates/district/base.html
index ca844fb9685c07bfdbf0a508bcbc25ce888569af..61a895a5dcaa75f9caa5355f747a131a269401e0 100644
--- a/district/templates/district/base.html
+++ b/district/templates/district/base.html
@@ -72,7 +72,7 @@
             </div>
 
             <div class="social-icon-group space-x-2 text-grey-200 py-4 lg:py-0">
-              {% include "district/_social_icons.html" %}
+              {% include "district/social_icons_snippet.html" %}
             </div>
 
           </div>
@@ -227,7 +227,7 @@
         <section class="footer__social lg:text-right">
           <div class="mb-4">
             <div class="social-icon-group space-x-2 text-white pb-4">
-              {% include "district/_social_icons.html" %}
+              {% include "district/social_icons_snippet.html" %}
             </div>
             <a href="mailto:{{ page.root_page.contact_email|default:"info@pirati.cz" }}" class="contact-line icon-link content-block--nostyle " ><i class="ico--envelope"></i><span>Dejte nám vědět</span></a>
           </div>
@@ -257,13 +257,13 @@
         <div class="container container--default">
           <div class="grid gap-4 grid-cols-1 md:grid-cols-2 xl:grid-cols-3">
             {% if page.root_page.footperson_coord %}
-              {% include "shared/_person_badge.html" with person=page.root_page.footperson_coord title="Koordinátor" %}
+              {% include "shared/person_badge_snippet.html" with person=page.root_page.footperson_coord title="Koordinátor" %}
             {% endif %}
             {% if page.root_page.footperson_electman %}
-              {% include "shared/_person_badge.html" with person=page.root_page.footperson_electman title="Volební manažer" %}
+              {% include "shared/person_badge_snippet.html" with person=page.root_page.footperson_electman title="Volební manažer" %}
             {% endif %}
             {% if page.root_page.footperson_media %}
-              {% include "shared/_person_badge.html" with person=page.root_page.footperson_media title="Kontakt pro média" %}
+              {% include "shared/person_badge_snippet.html" with person=page.root_page.footperson_media title="Kontakt pro média" %}
             {% endif %}
           </div>
         </div>
diff --git a/district/templates/district/district_contact.html b/district/templates/district/district_contact.html
index 7c0c44c096c2505a741640c069cbc5b24d7cf757..b36d00c13345e268b7f81d6cdc08a56278cc7031 100644
--- a/district/templates/district/district_contact.html
+++ b/district/templates/district/district_contact.html
@@ -18,7 +18,7 @@
     <div>
       <h2 class="head-heavy-sm mb-2 lg:mb-4 mt-4">{{ item.value.name }}</h2>
       <div class="card elevation-3 p-3 mb-3">
-        {% include "shared/_person_badge.html" with person=item.value.person  %}
+        {% include "shared/person_badge_snippet.html" with person=item.value.person  %}
       </div>
     </div>
 
@@ -80,7 +80,7 @@
 
   </div>
 
-  {% include "district/_followus.html" %}
+  {% include "district/followus_snippet.html" %}
 
 </div>
 
diff --git a/district/templates/district/district_home_page.html b/district/templates/district/district_home_page.html
index 55386e575bf5e6c0d16b083b81d46837f52ccc39..275f6237c467d4fee0be68b9fc9b68b1dbc41ea3 100644
--- a/district/templates/district/district_home_page.html
+++ b/district/templates/district/district_home_page.html
@@ -13,8 +13,8 @@
         {% endfor %}
     </div>
 
-    {% include "district/_more_articles.html" %}
-    {% include "district/_followus.html" %}
+    {% include "district/more_articles_snippet.html" %}
+    {% include "district/followus_snippet.html" %}
 
 </main>
 {% endblock %}
diff --git a/district/templates/district/_followus.html b/district/templates/district/followus_snippet.html
similarity index 100%
rename from district/templates/district/_followus.html
rename to district/templates/district/followus_snippet.html
diff --git a/district/templates/district/_more_articles.html b/district/templates/district/more_articles_snippet.html
similarity index 100%
rename from district/templates/district/_more_articles.html
rename to district/templates/district/more_articles_snippet.html
diff --git a/district/templates/district/_social_icons.html b/district/templates/district/social_icons_snippet.html
similarity index 100%
rename from district/templates/district/_social_icons.html
rename to district/templates/district/social_icons_snippet.html
diff --git a/district/templates/shared/article.html b/district/templates/shared/article.html
index 0f5929687e4aa2e0ec52ed18e721778552811f42..2b2087f4ac28e0eca2be99dc77dc8fc159bf8ee7 100644
--- a/district/templates/shared/article.html
+++ b/district/templates/shared/article.html
@@ -80,7 +80,7 @@
 
 </div>
 
-{% include "district/_more_articles.html" %}
+{% include "district/more_articles_snippet.html" %}
 
 
 {% endblock %}
diff --git a/district/templates/shared/people_page.html b/district/templates/shared/people_page.html
index 43a748320a12a6b9707275d0840a3e6342aa81a3..a0228fde4a39297ffb901942f33150ad2ea22bac 100644
--- a/district/templates/shared/people_page.html
+++ b/district/templates/shared/people_page.html
@@ -13,7 +13,7 @@
 
   <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 row-gap-8 col-gap-8">
   {% for person in people %}
-    {% include "shared/_person_badge.html" with person=person  %}
+    {% include "shared/person_badge_snippet.html" with person=person  %}
   {% endfor %}
   </div>
 
diff --git a/district/templates/shared/person_page.html b/district/templates/shared/person_page.html
index efd9f13ff9d49b30c504337fc5ebcb41398a1474..fa889e7f13dca52ccaf73f997f9113ca0a9bc693 100644
--- a/district/templates/shared/person_page.html
+++ b/district/templates/shared/person_page.html
@@ -78,7 +78,7 @@
 
       <div class="space-y-4">
       {% for person in random_people %}
-        {% include "shared/_person_badge.html" with person=person skipcontacts=1 %}
+        {% include "shared/person_badge_snippet.html" with person=person skipcontacts=1 %}
       {% endfor %}
       </div>
 
diff --git a/shared/templates/shared/_person_badge.html b/shared/templates/shared/person_badge_snippet.html
similarity index 100%
rename from shared/templates/shared/_person_badge.html
rename to shared/templates/shared/person_badge_snippet.html