diff --git a/Makefile b/Makefile
index 764737df..680eac74 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 OWNER:=jupyter
 # need to list these manually because there's a dependency tree
 ALL_STACKS:=minimal-kernel \
-	tiny-notebook \
+	base-notebook \
 	minimal-notebook \
 	r-notebook \
 	scipy-notebook \
diff --git a/tiny-notebook/.dockerignore b/base-notebook/.dockerignore
similarity index 100%
rename from tiny-notebook/.dockerignore
rename to base-notebook/.dockerignore
diff --git a/tiny-notebook/Dockerfile b/base-notebook/Dockerfile
similarity index 100%
rename from tiny-notebook/Dockerfile
rename to base-notebook/Dockerfile
diff --git a/tiny-notebook/README.md b/base-notebook/README.md
similarity index 93%
rename from tiny-notebook/README.md
rename to base-notebook/README.md
index c5a96394..19054f68 100644
--- a/tiny-notebook/README.md
+++ b/base-notebook/README.md
@@ -1,13 +1,13 @@
-![docker pulls](https://img.shields.io/docker/pulls/jupyter/tiny-notebook.svg) ![docker stars](https://img.shields.io/docker/stars/jupyter/tiny-notebook.svg)
+![docker pulls](https://img.shields.io/docker/pulls/jupyter/base-notebook.svg) ![docker stars](https://img.shields.io/docker/stars/jupyter/base-notebook.svg)
 
-# Tiny Jupyter Notebook Stack
+# Base Jupyter Notebook Stack
 
 Small base image for defining your own stack
 
 ## What it Gives You
 
-* Minimally-functional Jupyter Notebook 4.2.x
-* Conda Python 3.x
+* Minimally-functional Jupyter Notebook 4.2.x (e.g., no pandoc for document conversion)
+* Miniconda Python 3.x
 * No preinstalled scientific computing packages
 * Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda`
 * [tini](https://github.com/krallin/tini) as the container entrypoint and [start-notebook.sh](./start-notebook.sh) as the default command
@@ -19,7 +19,7 @@ Small base image for defining your own stack
 The following command starts a container with the Notebook server listening for HTTP connections on port 8888 without authentication configured.
 
 ```
-docker run -d -p 8888:8888 jupyter/tiny-notebook
+docker run -d -p 8888:8888 jupyter/base-notebook
 ```
 
 ## Notebook Options
diff --git a/tiny-notebook/jupyter_notebook_config.py b/base-notebook/jupyter_notebook_config.py
similarity index 100%
rename from tiny-notebook/jupyter_notebook_config.py
rename to base-notebook/jupyter_notebook_config.py
diff --git a/tiny-notebook/start-notebook.sh b/base-notebook/start-notebook.sh
similarity index 100%
rename from tiny-notebook/start-notebook.sh
rename to base-notebook/start-notebook.sh
diff --git a/tiny-notebook/start-singleuser.sh b/base-notebook/start-singleuser.sh
similarity index 100%
rename from tiny-notebook/start-singleuser.sh
rename to base-notebook/start-singleuser.sh
diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile
index f54916ba..aeac05fd 100644
--- a/minimal-notebook/Dockerfile
+++ b/minimal-notebook/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-FROM jupyter/tiny-notebook
+FROM jupyter/base-notebook
 
 MAINTAINER Jupyter Project <jupyter@googlegroups.com>
 
diff --git a/minimal-notebook/README.md b/minimal-notebook/README.md
index 135e5038..e60fe8b1 100644
--- a/minimal-notebook/README.md
+++ b/minimal-notebook/README.md
@@ -7,7 +7,7 @@ Small image for working in the notebook and installing your own libraries
 ## What it Gives You
 
 * Fully-functional Jupyter Notebook 4.2.x
-* Conda Python 3.x
+* Miniconda Python 3.x
 * No preinstalled scientific computing packages
 * Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda`
 * [tini](https://github.com/krallin/tini) as the container entrypoint and [start-notebook.sh](./start-notebook.sh) as the default command