diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e67af4..07cf1b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Rename `base.blade.php` to `app.blade.php` ([#1864](https://github.com/roots/sage/pull/1864))
 * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822))
 * Add support for HTML injection ([#1817](https://github.com/roots/sage/pull/1817))
 
diff --git a/templates/404.blade.php b/templates/404.blade.php
index 384c394..16fb8d5 100644
--- a/templates/404.blade.php
+++ b/templates/404.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @include('partials.page-header')
diff --git a/templates/index.blade.php b/templates/index.blade.php
index bb3ef90..f91575c 100644
--- a/templates/index.blade.php
+++ b/templates/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @include('partials.page-header')
diff --git a/templates/layouts/base.blade.php b/templates/layouts/app.blade.php
similarity index 100%
rename from templates/layouts/base.blade.php
rename to templates/layouts/app.blade.php
diff --git a/templates/page.blade.php b/templates/page.blade.php
index d18f59b..edae985 100644
--- a/templates/page.blade.php
+++ b/templates/page.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @while(have_posts()) @php(the_post())
diff --git a/templates/search.blade.php b/templates/search.blade.php
index e5897c5..f0a021e 100644
--- a/templates/search.blade.php
+++ b/templates/search.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @include('partials.page-header')
diff --git a/templates/single.blade.php b/templates/single.blade.php
index 62e9c85..b94c206 100644
--- a/templates/single.blade.php
+++ b/templates/single.blade.php
@@ -1,8 +1,7 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @while(have_posts()) @php(the_post())
     @include('partials/content-single-'.get_post_type())
   @endwhile
 @endsection
-
diff --git a/templates/template-custom.blade.php b/templates/template-custom.blade.php
index 460854d..762a54a 100644
--- a/templates/template-custom.blade.php
+++ b/templates/template-custom.blade.php
@@ -2,7 +2,7 @@
   Template Name: Custom Template
 --}}
 
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @while(have_posts()) @php(the_post())