diff --git a/archive.php b/archive.php
index 3b386b5..ebf0084 100644
--- a/archive.php
+++ b/archive.php
@@ -91,7 +91,7 @@ get_header(); ?>
 
 		<?php else : ?>
 
-			<?php get_template_part( 'no-results', 'archive' ); ?>
+			<?php get_template_part( 'content', 'none' ); ?>
 
 		<?php endif; ?>
 
diff --git a/no-results.php b/content-none.php
similarity index 100%
rename from no-results.php
rename to content-none.php
diff --git a/index.php b/index.php
index 01e8d68..ced250e 100644
--- a/index.php
+++ b/index.php
@@ -35,7 +35,7 @@ get_header(); ?>
 
 		<?php else : ?>
 
-			<?php get_template_part( 'no-results', 'index' ); ?>
+			<?php get_template_part( 'content', 'none' ); ?>
 
 		<?php endif; ?>
 
@@ -43,4 +43,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/languages/_s.pot b/languages/_s.pot
index 9063997..ff9b561 100644
--- a/languages/_s.pot
+++ b/languages/_s.pot
@@ -94,6 +94,27 @@ msgstr ""
 msgid "Comments are closed."
 msgstr ""
 
+#: content-none.php:13
+msgid "Nothing Found"
+msgstr ""
+
+#: content-none.php:19
+msgid ""
+"Ready to publish your first post? <a href=\"%1$s\">Get started here</a>."
+msgstr ""
+
+#: content-none.php:23
+msgid ""
+"Sorry, but nothing matched your search terms. Please try again with some "
+"different keywords."
+msgstr ""
+
+#: content-none.php:28
+msgid ""
+"It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps "
+"searching can help."
+msgstr ""
+
 #: content-page.php:18 content-single.php:20 content.php:27 image.php:58
 msgid "Pages:"
 msgstr ""
@@ -242,27 +263,6 @@ msgid ""
 "%2$s</span>"
 msgstr ""
 
-#: no-results.php:13
-msgid "Nothing Found"
-msgstr ""
-
-#: no-results.php:19
-msgid ""
-"Ready to publish your first post? <a href=\"%1$s\">Get started here</a>."
-msgstr ""
-
-#: no-results.php:23
-msgid ""
-"Sorry, but nothing matched your search terms. Please try again with some "
-"different keywords."
-msgstr ""
-
-#: no-results.php:28
-msgid ""
-"It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps "
-"searching can help."
-msgstr ""
-
 #: search.php:16
 msgid "Search Results for: %s"
 msgstr ""
diff --git a/search.php b/search.php
index e28eece..1840677 100644
--- a/search.php
+++ b/search.php
@@ -27,7 +27,7 @@ get_header(); ?>
 
 		<?php else : ?>
 
-			<?php get_template_part( 'no-results', 'search' ); ?>
+			<?php get_template_part( 'content', 'none' ); ?>
 
 		<?php endif; ?>
 
@@ -35,4 +35,4 @@ get_header(); ?>
 	</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>