diff --git a/CHANGELOG.md b/CHANGELOG.md
index c95b33d..622879b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Rename page-custom.php to template-custom.php
 * Don't warn about unwritable htaccess if that option is disabled
 * Add missing collapse class for top navbar
 * Add comment template
diff --git a/doc/lib.md b/doc/lib.md
index 7a78d47..4a50400 100644
--- a/doc/lib.md
+++ b/doc/lib.md
@@ -29,7 +29,7 @@ If you don't want to use one of the features, either comment out the line or rem
 
 #### Define which pages shouldn't have the sidebar
 
-`roots_display_sidebar()` is used to define which pages shouldn't get the sidebar. By default, the 404, front `front-page.php` and `page-custom.php` templates are full width. If you would like to remove the sidebar from additional pages, add in the appropriate conditional or page template name.
+`roots_display_sidebar()` is used to define which pages shouldn't get the sidebar. By default, the 404, front `front-page.php` and `template-custom.php` templates are full width. If you would like to remove the sidebar from additional pages, add in the appropriate conditional or page template name.
 
 ### h5bp-htaccess
 
diff --git a/doc/usage.md b/doc/usage.md
index a41d0b6..84ad848 100755
--- a/doc/usage.md
+++ b/doc/usage.md
@@ -65,10 +65,10 @@ A basic Roots theme initially looks like this:
 ├── functions.php
 ├── index.php
 ├── page.php
-├── page-custom.php
 ├── screenshot.png
 ├── single.php
-└── style.css
+├── style.css
+└── template-custom.php
 ```
 
 What follows is a general overview of each major part and how to use them.
@@ -128,10 +128,6 @@ This file is used to serve all of the archive templates.
 
 This file is used to serve the page template.
 
-### page-custom.php
-
-An example of a custom page template. By default, this page is full width and doesn't contain a sidebar as defined in `lib/config.php`'s `roots_sidebar()` function.
-
 ### single.php
 
 This file is used to serve the single post template.
@@ -139,3 +135,7 @@ This file is used to serve the single post template.
 ### style.css
 
 This file is used to tell WordPress that we're a theme. None of the actual CSS is contained in this file.
+
+### template-custom.php
+
+An example of a custom page template. By default, this page is full width and doesn't contain a sidebar as defined in `lib/config.php`'s `roots_sidebar()` function.
diff --git a/lib/config.php b/lib/config.php
index 7b8b724..9999198 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -64,7 +64,7 @@ function roots_display_sidebar() {
      * Any of these page templates that return true won't show the sidebar
      */
     array(
-      'page-custom.php'
+      'template-custom.php'
     )
   );
 
diff --git a/page-custom.php b/template-custom.php
similarity index 100%
rename from page-custom.php
rename to template-custom.php