diff --git a/docs/en/configuring-pagination.md b/docs/en/configuring-pagination.md
index 2149c13..c1ea212 100644
--- a/docs/en/configuring-pagination.md
+++ b/docs/en/configuring-pagination.md
@@ -1,5 +1,5 @@
 # Configuring pagination
 To customise the look and feel of the pagination component, simply override the template located 
-at `/blog/templates/Includes/Pagination.ss`
+at `/blog/templates/SilverStripe/Blog/Includes/Pagination.ss`
 
 If you have comments enabled, comment pagination is configurable via the [SilverStripe Comments Module configuration](https://github.com/silverstripe/silverstripe-comments/blob/master/docs/en/Configuration.md).
\ No newline at end of file
diff --git a/templates/Includes/BlogSideBar.ss b/templates/SilverStripe/Blog/Includes/BlogSideBar.ss
similarity index 100%
rename from templates/Includes/BlogSideBar.ss
rename to templates/SilverStripe/Blog/Includes/BlogSideBar.ss
diff --git a/templates/Includes/EntryMeta.ss b/templates/SilverStripe/Blog/Includes/EntryMeta.ss
similarity index 100%
rename from templates/Includes/EntryMeta.ss
rename to templates/SilverStripe/Blog/Includes/EntryMeta.ss
diff --git a/templates/Includes/MemberDetails.ss b/templates/SilverStripe/Blog/Includes/MemberDetails.ss
similarity index 100%
rename from templates/Includes/MemberDetails.ss
rename to templates/SilverStripe/Blog/Includes/MemberDetails.ss
diff --git a/templates/Includes/Pagination.ss b/templates/SilverStripe/Blog/Includes/Pagination.ss
similarity index 100%
rename from templates/Includes/Pagination.ss
rename to templates/SilverStripe/Blog/Includes/Pagination.ss
diff --git a/templates/Includes/PostSummary.ss b/templates/SilverStripe/Blog/Includes/PostSummary.ss
similarity index 92%
rename from templates/Includes/PostSummary.ss
rename to templates/SilverStripe/Blog/Includes/PostSummary.ss
index b06d1f1..6fc5ab1 100644
--- a/templates/Includes/PostSummary.ss
+++ b/templates/SilverStripe/Blog/Includes/PostSummary.ss
@@ -23,5 +23,5 @@
 			</a>
 		</p>
 
-	<% include EntryMeta %>
+	<% include SilverStripe\\Blog\\EntryMeta %>
 </div>
diff --git a/templates/SilverStripe/Blog/Model/Layout/Blog.ss b/templates/SilverStripe/Blog/Model/Layout/Blog.ss
index 5a29c3b..144e5df 100644
--- a/templates/SilverStripe/Blog/Model/Layout/Blog.ss
+++ b/templates/SilverStripe/Blog/Model/Layout/Blog.ss
@@ -26,7 +26,7 @@
 
 		<% if $PaginatedList.Exists %>
 			<% loop $PaginatedList %>
-				<% include PostSummary %>
+				<% include SilverStripe\\Blog\\PostSummary %>
 			<% end_loop %>
 		<% else %>
 			<p><%t Blog.NoPosts 'There are no posts' %></p>
@@ -37,8 +37,8 @@
 	$CommentsForm
 
 	<% with $PaginatedList %>
-		<% include Pagination %>
+		<% include SilverStripe\\Blog\\Pagination %>
 	<% end_with %>
 </div>
 
-<% include BlogSideBar %>
+<% include SilverStripe\\Blog\\BlogSideBar %>
diff --git a/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss b/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
index df0b7db..90466c0 100644
--- a/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
+++ b/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
@@ -10,11 +10,11 @@
 
 		<div class="content">$Content</div>
 
-		<% include EntryMeta %>
+		<% include SilverStripe\\Blog\\EntryMeta %>
 	</article>
 
 	$Form
 	$CommentsForm
 </div>
 
-<% include BlogSideBar %>
+<% include SilverStripe\\Blog\\BlogSideBar %>
diff --git a/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss b/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss
index 78f65dc..36eedf2 100644
--- a/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss
+++ b/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss
@@ -2,12 +2,12 @@
 
 <div class="blog-entry content-container <% if $SideBarView %>unit size3of4<% end_if %>">
 
-	<% include MemberDetails %>
+	<% include SilverStripe\\Blog\\MemberDetails %>
 
 	<% if $PaginatedList.Exists %>
 		<h2>Posts by $CurrentProfile.FirstName $CurrentProfile.Surname for $Title:</h2>
 		<% loop $PaginatedList %>
-			<% include PostSummary %>
+			<% include SilverStripe\\Blog\\PostSummary %>
 		<% end_loop %>
 	<% end_if %>
 
@@ -15,9 +15,9 @@
 	$CommentsForm
 
 	<% with $PaginatedList %>
-		<% include Pagination %>
+		<% include SilverStripe\\Blog\\Pagination %>
 	<% end_with %>
 
 </div>
 
-<% include BlogSideBar %>
+<% include SilverStripe\\Blog\\BlogSideBar %>