diff --git a/mod/match.php b/mod/match.php
index e8a0a6605..ea59d7ee6 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -93,7 +93,7 @@ function match_content(App $a)
 		DI::sysmsg()->addInfo(DI::l10n()->t('No matches'));
 	}
 
-	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+	$tpl = Renderer::getMarkupTemplate('contact/list.tpl');
 	$o = Renderer::replaceMacros($tpl, [
 		'$title'    => DI::l10n()->t('Profile Match'),
 		'$contacts' => array_slice($entries, 0, $limit),
diff --git a/mod/suggest.php b/mod/suggest.php
index 9ad11f745..41fa1b06b 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -49,7 +49,7 @@ function suggest_content(App $a)
 		$entries[] = ModuleContact::getContactTemplateVars($contact);
 	}
 
-	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+	$tpl = Renderer::getMarkupTemplate('contact/list.tpl');
 
 	return Renderer::replaceMacros($tpl,[
 		'$title' => DI::l10n()->t('Friend Suggestions'),
diff --git a/src/Module/BaseSearch.php b/src/Module/BaseSearch.php
index b0f03c17d..2eace38bf 100644
--- a/src/Module/BaseSearch.php
+++ b/src/Module/BaseSearch.php
@@ -132,7 +132,7 @@ class BaseSearch extends BaseModule
 			}
 		}
 
-		$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+		$tpl = Renderer::getMarkupTemplate('contact/list.tpl');
 		return Renderer::replaceMacros($tpl, [
 			'title'     => $header,
 			'$contacts' => $entries,
diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index ce2afbfc7..72c4f67cf 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -178,7 +178,7 @@ class Network extends BaseModule
 		} elseif (self::$forumContactId) {
 			$contact = Contact::getById(self::$forumContactId);
 			if (DBA::isResult($contact)) {
-				$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('viewcontact_template.tpl'), [
+				$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('contact/list.tpl'), [
 					'contacts' => [ModuleContact::getContactTemplateVars($contact)],
 					'id' => DI::args()->get(0),
 				]) . $o;
diff --git a/view/templates/contact_template.tpl b/view/templates/contact/entry.tpl
similarity index 100%
rename from view/templates/contact_template.tpl
rename to view/templates/contact/entry.tpl
diff --git a/view/templates/viewcontact_template.tpl b/view/templates/contact/list.tpl
similarity index 85%
rename from view/templates/viewcontact_template.tpl
rename to view/templates/contact/list.tpl
index 562270e35..ec77fd521 100644
--- a/view/templates/viewcontact_template.tpl
+++ b/view/templates/contact/list.tpl
@@ -5,7 +5,7 @@
 
 <div id="viewcontact_wrapper-{{$id}}">
 {{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
+	{{include file="contact/entry.tpl"}}
 {{/foreach}}
 </div>
 <div class="clear"></div>
diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact/entry.tpl
similarity index 100%
rename from view/theme/frio/templates/contact_template.tpl
rename to view/theme/frio/templates/contact/entry.tpl
diff --git a/view/theme/frio/templates/viewcontact_template.tpl b/view/theme/frio/templates/contact/list.tpl
similarity index 89%
rename from view/theme/frio/templates/viewcontact_template.tpl
rename to view/theme/frio/templates/contact/list.tpl
index 90f286558..5a1ac026b 100644
--- a/view/theme/frio/templates/viewcontact_template.tpl
+++ b/view/theme/frio/templates/contact/list.tpl
@@ -8,7 +8,7 @@ at the suggest page and also at many other places *}}
 
 <ul id="viewcontact_wrapper{{if $id}}-{{$id}}{{/if}}" class="viewcontact_wrapper media-list">
 {{foreach $contacts as $contact}}
-	<li>{{include file="contact_template.tpl"}}</li>
+	<li>{{include file="contact/entry.tpl"}}</li>
 {{/foreach}}
 </ul>
 <div class="clear"></div>
diff --git a/view/theme/frio/templates/contact_drop_confirm.tpl b/view/theme/frio/templates/contact_drop_confirm.tpl
index a0ac15cf6..e4c0a3563 100644
--- a/view/theme/frio/templates/contact_drop_confirm.tpl
+++ b/view/theme/frio/templates/contact_drop_confirm.tpl
@@ -1,7 +1,7 @@
 <div id="contact-drop-confirm">
 	<h2 class="heading">{{$l10n.header}}</h2>
 
-	{{include file="contact_template.tpl" no_contacts_checkbox=True}}
+	{{include file="contact/entry.tpl" no_contacts_checkbox=True}}
 
 	{{include file="confirm.tpl"}}
 
diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index f13f10834..5c41c74e2 100644
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -49,10 +49,10 @@
 		</ul>
 		<div class="clear"></div>
 		<div id="contact-list">
-			{{* format each contact with the contact_template.tpl *}}
+			{{* format each contact with the contact/entry.tpl *}}
 			<ul id="viewcontact_wrapper" class="viewcontact_wrapper media-list">
 			{{foreach $contacts as $contact}}
-				<li>{{include file="contact_template.tpl"}}</li>
+				<li>{{include file="contact/entry.tpl"}}</li>
 			{{/foreach}}
 			</ul>
 		</div>
diff --git a/view/theme/frio/templates/directory_header.tpl b/view/theme/frio/templates/directory_header.tpl
index cef6208ad..2c271ffea 100644
--- a/view/theme/frio/templates/directory_header.tpl
+++ b/view/theme/frio/templates/directory_header.tpl
@@ -28,10 +28,10 @@
 
 	<div id="directory-search-end" class="clear"></div>
 
-	{{* format each contact with the contact_template.tpl *}}
+	{{* format each contact with the contact/entry.tpl *}}
 	<ul id="viewcontact_wrapper" class="viewcontact_wrapper media-list">
 	{{foreach $contacts as $contact}}
-		<li>{{include file="contact_template.tpl"}}</li>
+		<li>{{include file="contact/entry.tpl"}}</li>
 	{{/foreach}}
 	</ul>
 
diff --git a/view/theme/frio/templates/groupeditor.tpl b/view/theme/frio/templates/groupeditor.tpl
index 8d1db5b22..5ec157114 100644
--- a/view/theme/frio/templates/groupeditor.tpl
+++ b/view/theme/frio/templates/groupeditor.tpl
@@ -6,12 +6,12 @@
 
 		{{* The contacts who are already members of the contact group *}}
 		{{foreach $groupeditor.members as $contact}}
-			<li class="members active">{{include file="contact_template.tpl"}}</li>
+			<li class="members active">{{include file="contact/entry.tpl"}}</li>
 		{{/foreach}}
 
 		{{* The contacts who are not members of the contact group *}}
 		{{foreach $groupeditor.contacts as $contact}}
-			<li class="contacts">{{include file="contact_template.tpl"}}</li>
+			<li class="contacts">{{include file="contact/entry.tpl"}}</li>
 		{{/foreach}}
 
 	</ul>
diff --git a/view/theme/frio/templates/profile/contacts.tpl b/view/theme/frio/templates/profile/contacts.tpl
index 513223f31..4a313e774 100644
--- a/view/theme/frio/templates/profile/contacts.tpl
+++ b/view/theme/frio/templates/profile/contacts.tpl
@@ -10,7 +10,7 @@
 {{if $contacts}}
 	<ul id="viewcontact_wrapper{{if $id}}-{{$id}}{{/if}}" class="viewcontact_wrapper media-list">
 	{{foreach $contacts as $contact}}
-		<li>{{include file="contact_template.tpl"}}</li>
+		<li>{{include file="contact/entry.tpl"}}</li>
 	{{/foreach}}
 	</ul>
 {{else}}
diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact/entry.tpl
similarity index 100%
rename from view/theme/quattro/templates/contact_template.tpl
rename to view/theme/quattro/templates/contact/entry.tpl
diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact/entry.tpl
similarity index 100%
rename from view/theme/vier/templates/contact_template.tpl
rename to view/theme/vier/templates/contact/entry.tpl