diff --git a/_includes/JB/categories_list b/_includes/JB/categories_list
index ae5e6b5..218f525 100644
--- a/_includes/JB/categories_list
+++ b/_includes/JB/categories_list
@@ -2,11 +2,11 @@
 The categories_list include is a listing helper for categories.
 Usage:
   1) assign the 'categories_list' variable to a valid array of tags.
-  2) include helpers/categories_list.html.
+  2) include JB/categories_list
   example:
     <ul>
   	  {% assign categories_list = site.categories %}  
-  	  {% include helpers/categories_list.html %}
+  	  {% include JB/categories_list %}
   	</ul>
   
   Notes: 
diff --git a/_includes/JB/liquid_raw b/_includes/JB/liquid_raw
index 54a15e4..0bd9598 100644
--- a/_includes/JB/liquid_raw
+++ b/_includes/JB/liquid_raw
@@ -11,7 +11,7 @@ intend to give liquid examples. It's not an elegant by any means:
 
 Usage: 
   1) Define a 'text' variable with the block of liquid code you intend to display.
-  2) Pass the text variable to include helpers/liquid_raw.html.
+  2) Pass the text variable to include JB/liquid_raw
 
   example:
   {% capture text %}|.% for tag in tags_list %.|
@@ -19,7 +19,7 @@ Usage:
   |.% endfor %.|
 
   |.% assign tags_list = null %.|{% endcapture %}    
-  {% include helpers/liquid_raw.html %}
+  {% include JB/liquid_raw %}
   
   As seen here, you must use "|." and ".|" as opening and closing brackets.
 -->{% endcomment%}
diff --git a/_includes/JB/pages_list b/_includes/JB/pages_list
index 0e9ba87..c247a42 100644
--- a/_includes/JB/pages_list
+++ b/_includes/JB/pages_list
@@ -2,11 +2,11 @@
 The pages_list include is a listing helper.
 Usage:
   1) assign the 'pages_list' variable to a valid array of pages or posts.
-  2) include helpers/pages_list.html.
+  2) include JB/pages_list
   example:
     <ul>
   	  {% assign pages_list = site.pages %}  
-  	  {% include helpers/pages_list.html %}
+  	  {% include JB/pages_list %}
   	</ul>
   	
   Grouping: (optional): 
diff --git a/_includes/JB/posts_collate b/_includes/JB/posts_collate
index 42adef7..4b344aa 100644
--- a/_includes/JB/posts_collate
+++ b/_includes/JB/posts_collate
@@ -2,10 +2,10 @@
 Collate_posts helper. Collated posts by year and month.
 Usage:
   1) assign the 'posts_collate' variable to a valid array of posts.
-  2) include helpers/posts_collate.html.
+  2) include JB/posts_collate
   example:
     {% assign posts_collate = site.posts %}
-    {% include helpers/posts_collate.html %}
+    {% include JB/posts_collate %}
 
   Ordering:
     Posts are displayed in reverse chronological order.
diff --git a/_includes/JB/tags_list b/_includes/JB/tags_list
index f0ee45f..38725f3 100644
--- a/_includes/JB/tags_list
+++ b/_includes/JB/tags_list
@@ -2,11 +2,11 @@
 The tags_list include is a listing helper for tags.
 Usage:
   1) assign the 'tags_list' variable to a valid array of tags.
-  2) include helpers/tags_list.html.
+  2) include JB/tags_list
   example:
     <ul>
   	  {% assign tags_list = site.tags %}  
-  	  {% include helpers/tags_list.html %}
+  	  {% include JB/tags_list %}
   	</ul>
   
   Notes: 
diff --git a/_includes/themes/mark-reid/post.html b/_includes/themes/mark-reid/post.html
index 45b5984..76cbaed 100644
--- a/_includes/themes/mark-reid/post.html
+++ b/_includes/themes/mark-reid/post.html
@@ -3,7 +3,7 @@
   <h1 class="emphnext">{{ page.title }}</h1>
   <ul class="tag_box inline">
   {% assign tags_list = page.tags %}
-  {% include helpers/tags_list.html %}
+  {% include JB/tags_list %}
   </ul>
 
   {{ content }}
diff --git a/_includes/themes/the-minimum/post.html b/_includes/themes/the-minimum/post.html
index 9b5316b..4e6f11c 100644
--- a/_includes/themes/the-minimum/post.html
+++ b/_includes/themes/the-minimum/post.html
@@ -24,12 +24,12 @@ <h1 class="h2 entry-title">{{ page.title }}</h1>
 						<ul class="list-category list-linear">
 							<li class="list-head">category: </li>
 							{% assign categories_list = page.categories %}
-							{% include helpers/categories_list.html %}
+							{% include JB/categories_list %}
 						</ul>
 						<ul class="list-tag list-linear">
 							<li class="list-head">tags: </li>
 							{% assign tags_list = page.tags %}
-							{% include helpers/tags_list.html %}
+							{% include JB/tags_list %}
 						</ul>
 					</div><!-- meta -->
 				</div><!-- entry-content -->
diff --git a/_includes/themes/twitter/default.html b/_includes/themes/twitter/default.html
index 953ec63..cb1f306 100644
--- a/_includes/themes/twitter/default.html
+++ b/_includes/themes/twitter/default.html
@@ -33,7 +33,7 @@
           <ul class="nav">
             {% assign pages_list = site.pages %}
             {% assign group = 'navigation' %}
-            {% include helpers/pages_list.html %}
+            {% include JB/pages_list %}
           </ul>
         </div>
       </div>
diff --git a/_includes/themes/twitter/post.html b/_includes/themes/twitter/post.html
index ebf66ca..3c22eb2 100644
--- a/_includes/themes/twitter/post.html
+++ b/_includes/themes/twitter/post.html
@@ -33,7 +33,7 @@ <h4>Published</h4>
     <h4>Tags</h4>
     <ul class="tag_box">
     {% assign tags_list = page.tags %}
-    {% include helpers/tags_list.html %}
+    {% include JB/tags_list %}
     </ul>
   {% endunless %}  
   </div>
diff --git a/_posts/core-samples/2011-12-29-jekyll-introduction.md b/_posts/core-samples/2011-12-29-jekyll-introduction.md
index 0519fb3..0722bee 100644
--- a/_posts/core-samples/2011-12-29-jekyll-introduction.md
+++ b/_posts/core-samples/2011-12-29-jekyll-introduction.md
@@ -242,7 +242,7 @@ Render the content variable wherever you want your main content to be injected i
   </div>
 </body>
 ...{% endcapture %}
-{% include helpers/liquid_raw.html %}
+{% include JB/liquid_raw %}
 
 ### Sub-Templates
 
diff --git a/archive.html b/archive.html
index 683459c..dc7c054 100644
--- a/archive.html
+++ b/archive.html
@@ -7,4 +7,4 @@
 {% include JB/setup %}
 
 {% assign posts_collate = site.posts %}
-{% include helpers/posts_collate.html %}
\ No newline at end of file
+{% include JB/posts_collate %}
\ No newline at end of file
diff --git a/categories.html b/categories.html
index b95b0ae..cdb8789 100644
--- a/categories.html
+++ b/categories.html
@@ -8,7 +8,7 @@
 
 <ul class="tag_box inline">
   {% assign categories_list = site.categories %}
-  {% include helpers/categories_list.html %}
+  {% include JB/categories_list %}
 </ul>
 
 
@@ -16,7 +16,7 @@
   <h2 id="{{ category[0] }}-ref">{{ category[0] | join: "/" }}</h2>
   <ul>
     {% assign pages_list = category[1] %}  
-    {% include helpers/pages_list.html %}
+    {% include JB/pages_list %}
   </ul>
 {% endfor %}
 
diff --git a/pages.html b/pages.html
index 4b298ce..bde1a32 100644
--- a/pages.html
+++ b/pages.html
@@ -9,5 +9,5 @@
 <h2>All Pages</h2>
 <ul>
 {% assign pages_list = site.pages %}
-{% include helpers/pages_list.html %}
+{% include JB/pages_list %}
 </ul>
diff --git a/tags.html b/tags.html
index 6a29279..5e216cb 100644
--- a/tags.html
+++ b/tags.html
@@ -8,7 +8,7 @@
 
 <ul class="tag_box inline">
   {% assign tags_list = site.tags %}  
-  {% include helpers/tags_list.html %}
+  {% include JB/tags_list %}
 </ul>
 
 
@@ -16,6 +16,6 @@
   <h2 id="{{ tag[0] }}-ref">{{ tag[0] }}</h2>
   <ul>
     {% assign pages_list = tag[1] %}  
-    {% include helpers/pages_list.html %}
+    {% include JB/pages_list %}
   </ul>
 {% endfor %}