diff --git a/_posts/2012-01-02-template-comments-disabled.md b/_posts/2012-01-02-layout-comments-disabled.md
similarity index 69%
rename from _posts/2012-01-02-template-comments-disabled.md
rename to _posts/2012-01-02-layout-comments-disabled.md
index 250e5def..ab69a527 100644
--- a/_posts/2012-01-02-template-comments-disabled.md
+++ b/_posts/2012-01-02-layout-comments-disabled.md
@@ -1,12 +1,12 @@
 ---
-title: "Template: Comments Disabled"
+title: "Layout: Comments Disabled"
 comments: false
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - comments
-  - template
+  - layout
 ---
 
 This post has its comments disabled.
diff --git a/_posts/2012-01-02-template-comments.md b/_posts/2012-01-02-layout-comments.md
similarity index 63%
rename from _posts/2012-01-02-template-comments.md
rename to _posts/2012-01-02-layout-comments.md
index ee9f54ab..cf697b80 100644
--- a/_posts/2012-01-02-template-comments.md
+++ b/_posts/2012-01-02-layout-comments.md
@@ -1,12 +1,12 @@
 ---
-title: "Template: Comments Enabled"
+title: "Layout: Comments Enabled"
 comments: true
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - comments
-  - template
+  - layout
 ---
 
 This post should display comments.
\ No newline at end of file
diff --git a/_posts/2012-01-02-template-read-time-disabled.md b/_posts/2012-01-02-layout-read-time-disabled.md
similarity index 99%
rename from _posts/2012-01-02-template-read-time-disabled.md
rename to _posts/2012-01-02-layout-read-time-disabled.md
index f4ba1960..d8899224 100644
--- a/_posts/2012-01-02-template-read-time-disabled.md
+++ b/_posts/2012-01-02-layout-read-time-disabled.md
@@ -1,5 +1,5 @@
 ---
-title: "Template: Read Time Disabled"
+title: "Layout: Read Time Disabled"
 read_time: false
 tags:
   - read time
diff --git a/_posts/2012-01-02-template-read-time.md b/_posts/2012-01-02-layout-read-time.md
similarity index 99%
rename from _posts/2012-01-02-template-read-time.md
rename to _posts/2012-01-02-layout-read-time.md
index 98b942d4..a636e0a4 100644
--- a/_posts/2012-01-02-template-read-time.md
+++ b/_posts/2012-01-02-layout-read-time.md
@@ -1,5 +1,5 @@
 ---
-title: "Template: Read Time Enabled"
+title: "Layout: Read Time Enabled"
 read_time: true
 tags:
   - read time
diff --git a/_posts/2012-01-02-template-related-posts-disabled.md b/_posts/2012-01-02-layout-related-posts-disabled.md
similarity index 69%
rename from _posts/2012-01-02-template-related-posts-disabled.md
rename to _posts/2012-01-02-layout-related-posts-disabled.md
index 00e77bc6..3831e740 100644
--- a/_posts/2012-01-02-template-related-posts-disabled.md
+++ b/_posts/2012-01-02-layout-related-posts-disabled.md
@@ -1,12 +1,12 @@
 ---
-title: "Template: Related Posts Disabled"
+title: "Layout: Related Posts Disabled"
 related: false
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - related posts
-  - template
+  - layout
 ---
 
 This post has related posts disabled.
diff --git a/_posts/2012-01-02-template-related-posts.md b/_posts/2012-01-02-layout-related-posts.md
similarity index 62%
rename from _posts/2012-01-02-template-related-posts.md
rename to _posts/2012-01-02-layout-related-posts.md
index e91f0df2..0293bc6f 100644
--- a/_posts/2012-01-02-template-related-posts.md
+++ b/_posts/2012-01-02-layout-related-posts.md
@@ -1,12 +1,12 @@
 ---
-title: "Template: Related Posts Enabled"
+title: "Layout: Related Posts Enabled"
 related: true
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - related posts
-  - template
+  - layout
 ---
 
 This post has related posts enabled.
\ No newline at end of file
diff --git a/_posts/2012-01-02-template-sharing-disabled.md b/_posts/2012-01-02-layout-sharing-disabled.md
similarity index 66%
rename from _posts/2012-01-02-template-sharing-disabled.md
rename to _posts/2012-01-02-layout-sharing-disabled.md
index 84a5ceff..c69d8bbf 100644
--- a/_posts/2012-01-02-template-sharing-disabled.md
+++ b/_posts/2012-01-02-layout-sharing-disabled.md
@@ -1,12 +1,12 @@
 ---
-title: "Template: Social Sharing Links Disabled"
+title: "Layout: Social Sharing Links Disabled"
 share: false
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - social
-  - template
+  - layout
 ---
 
 This post has social sharing disabled.
diff --git a/_posts/2012-01-02-template-sharing.md b/_posts/2012-01-02-layout-sharing.md
similarity index 60%
rename from _posts/2012-01-02-template-sharing.md
rename to _posts/2012-01-02-layout-sharing.md
index 5b82536a..09808f14 100644
--- a/_posts/2012-01-02-template-sharing.md
+++ b/_posts/2012-01-02-layout-sharing.md
@@ -1,12 +1,12 @@
 ---
-title: "Template: Social Sharing Links Enabled"
+title: "Layout: Social Sharing Links Enabled"
 share: true
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - social
-  - template
+  - layout
 ---
 
 This post should display social sharing links.
\ No newline at end of file
diff --git a/_posts/2012-01-03-template-read-time-comments-sharing-related-posts-disabled.md b/_posts/2012-01-03-layout-read-time-comments-sharing-related-posts-disabled.md
similarity index 72%
rename from _posts/2012-01-03-template-read-time-comments-sharing-related-posts-disabled.md
rename to _posts/2012-01-03-layout-read-time-comments-sharing-related-posts-disabled.md
index 831c4201..dacb207a 100644
--- a/_posts/2012-01-03-template-read-time-comments-sharing-related-posts-disabled.md
+++ b/_posts/2012-01-03-layout-read-time-comments-sharing-related-posts-disabled.md
@@ -1,17 +1,17 @@
 ---
-title: "Template: Reading Time, Comments, Social Sharing Links, and Related Posts Disabled"
+title: "Layout: Reading Time, Comments, Social Sharing Links, and Related Posts Disabled"
 read_time: false
 comments: false
 share: false
 related: false
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - related posts
   - social
   - comments
-  - template
+  - layout
 ---
 
 This post has reading time, comments, social sharing links, and related posts disabled.
diff --git a/_posts/2012-01-03-template-table-of-contents-post.md b/_posts/2012-01-03-layout-table-of-contents-post.md
similarity index 98%
rename from _posts/2012-01-03-template-table-of-contents-post.md
rename to _posts/2012-01-03-layout-table-of-contents-post.md
index 836643b4..602af3cf 100644
--- a/_posts/2012-01-03-template-table-of-contents-post.md
+++ b/_posts/2012-01-03-layout-table-of-contents-post.md
@@ -1,5 +1,5 @@
 ---
-title: "Template: Post with Table Of Contents"
+title: "Layout: Post with Table Of Contents"
 header:
   image: unsplash-image-9.jpg
   caption: "Photo credit: [**Unsplash**](https://unsplash.com)"
diff --git a/_posts/2012-03-14-template-code-excerpt-generated.md b/_posts/2012-03-14-layout-code-excerpt-generated.md
similarity index 86%
rename from _posts/2012-03-14-template-code-excerpt-generated.md
rename to _posts/2012-03-14-layout-code-excerpt-generated.md
index 78e9dbcd..0bdc595e 100644
--- a/_posts/2012-03-14-template-code-excerpt-generated.md
+++ b/_posts/2012-03-14-layout-code-excerpt-generated.md
@@ -1,12 +1,12 @@
 ---
-title: "Template: Code Excerpt (Generated)"
+title: "Layout: Code Excerpt (Generated)"
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - content
   - excerpt
-  - template
+  - layout
 ---
 
 This is the post content with inline code, (e.g. `<span style="color: red;">red</span>`. It should be displayed in place of the auto-generated excerpt in single-page views. Archive-index pages should display an auto-generated excerpt of this content.
diff --git a/_posts/2012-03-14-template-excerpt-defined.md b/_posts/2012-03-14-layout-excerpt-defined.md
similarity index 86%
rename from _posts/2012-03-14-template-excerpt-defined.md
rename to _posts/2012-03-14-layout-excerpt-defined.md
index 7c41c571..7091cf8f 100644
--- a/_posts/2012-03-14-template-excerpt-defined.md
+++ b/_posts/2012-03-14-layout-excerpt-defined.md
@@ -1,13 +1,13 @@
 ---
-title: "Template: Excerpt (Defined)"
+title: "Layout: Excerpt (Defined)"
 excerpt: "This is a user-defined post excerpt. It should be displayed in place of the post content in archive-index pages."
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - content
   - excerpt
-  - template
+  - layout
 ---
 
 This is the post content. It should be displayed in place of the user-defined excerpt in archive-index pages.
diff --git a/_posts/2012-03-14-template-excerpt-generated.md b/_posts/2012-03-14-layout-excerpt-generated.md
similarity index 83%
rename from _posts/2012-03-14-template-excerpt-generated.md
rename to _posts/2012-03-14-layout-excerpt-generated.md
index bf9f4d82..5f26140e 100644
--- a/_posts/2012-03-14-template-excerpt-generated.md
+++ b/_posts/2012-03-14-layout-excerpt-generated.md
@@ -1,13 +1,13 @@
 ---
-title: "Template: Excerpt (Generated)"
+title: "Layout: Excerpt (Generated)"
 excerpt_separator: "<!--more-->"
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - content
   - excerpt
-  - template
+  - layout
 ---
 
 This is the post content. Archive-index pages should display an auto-generated excerpt of this content.
diff --git a/_posts/2012-03-15-template-author-override.md b/_posts/2012-03-15-layout-author-override.md
similarity index 97%
rename from _posts/2012-03-15-template-author-override.md
rename to _posts/2012-03-15-layout-author-override.md
index f0d12636..87adc48b 100644
--- a/_posts/2012-03-15-template-author-override.md
+++ b/_posts/2012-03-15-layout-author-override.md
@@ -1,5 +1,5 @@
 ---
-title: "Template: Author Override"
+title: "Layout: Author Override"
 author: Billy Rick
 excerpt: "A post to test author overrides using a data file."
 ---
diff --git a/_posts/2012-03-15-template-author-sidebar-disabled.md b/_posts/2012-03-15-layout-author-sidebar-disabled.md
similarity index 81%
rename from _posts/2012-03-15-template-author-sidebar-disabled.md
rename to _posts/2012-03-15-layout-author-sidebar-disabled.md
index bb99890e..a4d0dc19 100644
--- a/_posts/2012-03-15-template-author-sidebar-disabled.md
+++ b/_posts/2012-03-15-layout-author-sidebar-disabled.md
@@ -1,5 +1,5 @@
 ---
-title: "Template: Author Sidebar Disabled"
+title: "Layout: Author Sidebar Disabled"
 excerpt: "A post to test disabling author sidebar."
 author_profile: false
 ---
diff --git a/_posts/2012-03-15-template-header-image-external.md b/_posts/2012-03-15-layout-header-image-external.md
similarity index 80%
rename from _posts/2012-03-15-template-header-image-external.md
rename to _posts/2012-03-15-layout-header-image-external.md
index ad2d7f67..8dd7a01e 100644
--- a/_posts/2012-03-15-template-header-image-external.md
+++ b/_posts/2012-03-15-layout-header-image-external.md
@@ -1,15 +1,15 @@
 ---
-title: "Template: Header Image (External URL)"
+title: "Layout: Header Image (External URL)"
 header:
   image: https://farm5.staticflickr.com/4140/4939863887_84705982fd_b.jpg
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - edge case
   - featured image
   - image
-  - template
+  - layout
 ---
 
 This post should display a **header image**, if the theme supports it.
diff --git a/_posts/2012-03-15-template-header-image-horizontal.md b/_posts/2012-03-15-layout-header-image-horizontal.md
similarity index 83%
rename from _posts/2012-03-15-template-header-image-horizontal.md
rename to _posts/2012-03-15-layout-header-image-horizontal.md
index dcd3c26f..7b6ef472 100644
--- a/_posts/2012-03-15-template-header-image-horizontal.md
+++ b/_posts/2012-03-15-layout-header-image-horizontal.md
@@ -1,16 +1,16 @@
 ---
-title: "Template: Header Image (Horizontal)"
+title: "Layout: Header Image (Horizontal)"
 header:
   image: unsplash-image-1.jpg
   caption: "Photo credit: [**Unsplash**](https://unsplash.com)"
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - edge case
   - featured image
   - image
-  - template
+  - layout
 ---
 
 This post should display a **header image**, if the theme supports it.
diff --git a/_posts/2012-03-15-template-header-image-text-readability.md b/_posts/2012-03-15-layout-header-image-text-readability.md
similarity index 99%
rename from _posts/2012-03-15-template-header-image-text-readability.md
rename to _posts/2012-03-15-layout-header-image-text-readability.md
index ee7977a8..140a48cf 100644
--- a/_posts/2012-03-15-template-header-image-text-readability.md
+++ b/_posts/2012-03-15-layout-header-image-text-readability.md
@@ -1,5 +1,5 @@
 ---
-title: "Template: Header Image and Text Readability"
+title: "Layout: Header Image and Text Readability"
 header:
   image: unsplash-image-4.jpg
   caption: "Photo credit: [**Unsplash**](https://unsplash.com)"
diff --git a/_posts/2012-03-15-template-header-image-vertical.md b/_posts/2012-03-15-layout-header-image-vertical.md
similarity index 82%
rename from _posts/2012-03-15-template-header-image-vertical.md
rename to _posts/2012-03-15-layout-header-image-vertical.md
index 7c99e09d..2eae945c 100644
--- a/_posts/2012-03-15-template-header-image-vertical.md
+++ b/_posts/2012-03-15-layout-header-image-vertical.md
@@ -1,17 +1,16 @@
 ---
-title: "Template: Header Image (Vertical)"
+title: "Layout: Header Image (Vertical)"
 header:
   image: unsplash-image-6.jpg
   caption: "Photo credit: [**Unsplash**](https://unsplash.com)"
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
-  - Codex
   - edge case
   - featured image
   - image
-  - template
+  - layout
 ---
 
 This post should display a **header image**, if the theme supports it.
diff --git a/_posts/2012-03-15-template-header-overlay-color.md b/_posts/2012-03-15-layout-header-overlay-color.md
similarity index 78%
rename from _posts/2012-03-15-template-header-overlay-color.md
rename to _posts/2012-03-15-layout-header-overlay-color.md
index 6bc88088..69a85219 100644
--- a/_posts/2012-03-15-template-header-overlay-color.md
+++ b/_posts/2012-03-15-layout-header-overlay-color.md
@@ -1,14 +1,14 @@
 ---
-title: "Template: Header Overlay with Background Fill"
+title: "Layout: Header Overlay with Background Fill"
 header:
   overlay_color: "#333"
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - edge case
   - image
-  - template
+  - layout
 ---
 
 This post should display a **header with a solid background color**, if the theme supports it.
diff --git a/_posts/2012-03-15-template-header-overlay-image.md b/_posts/2012-03-15-layout-header-overlay-image.md
similarity index 85%
rename from _posts/2012-03-15-template-header-overlay-image.md
rename to _posts/2012-03-15-layout-header-overlay-image.md
index 25d16bb4..ad10f369 100644
--- a/_posts/2012-03-15-template-header-overlay-image.md
+++ b/_posts/2012-03-15-layout-header-overlay-image.md
@@ -1,16 +1,16 @@
 ---
-title: "Template: Header Image Overlay"
+title: "Layout: Header Image Overlay"
 header:
   overlay_image: unsplash-image-1.jpg
   caption: "Photo credit: [**Unsplash**](https://unsplash.com)"
   cta_url: "https://unsplash.com"
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - edge case
   - image
-  - template
+  - layout
 ---
 
 This post should display a **header with an overlay image**, if the theme supports it.
diff --git a/_posts/2012-03-15-template-more-tag.md b/_posts/2012-03-15-layout-more-tag.md
similarity index 85%
rename from _posts/2012-03-15-template-more-tag.md
rename to _posts/2012-03-15-layout-more-tag.md
index 652e4a05..45940a6e 100644
--- a/_posts/2012-03-15-template-more-tag.md
+++ b/_posts/2012-03-15-layout-more-tag.md
@@ -1,12 +1,12 @@
 ---
-title: "Template: More Tag"
+title: "Layout: More Tag"
 categories:
-  - Template
+  - Layout
   - Uncategorized
 tags:
   - content
   - read more
-  - template
+  - layout
 ---
 
 This content is before the [excerpt separator tag](http://jekyllrb.com/docs/posts/#post-excerpts).
diff --git a/_posts/2012-03-15-template-sidebar-custom.md b/_posts/2012-03-15-layout-sidebar-custom.md
similarity index 94%
rename from _posts/2012-03-15-template-sidebar-custom.md
rename to _posts/2012-03-15-layout-sidebar-custom.md
index 96f7fdc6..0dcbbfe2 100644
--- a/_posts/2012-03-15-template-sidebar-custom.md
+++ b/_posts/2012-03-15-layout-sidebar-custom.md
@@ -1,5 +1,5 @@
 ---
-title: "Template: Sidebar Custom"
+title: "Layout: Sidebar Custom"
 excerpt: "A post to custom sidebar content."
 author_profile: false
 sidebar: