diff --git a/episodes/03-transform.md b/episodes/03-transform.md
index ac75620a..b1950d71 100644
--- a/episodes/03-transform.md
+++ b/episodes/03-transform.md
@@ -52,7 +52,7 @@ analysis, identifying stars with the proper motion we expect for GD-1.
 If you are starting a new notebook for this episode, expand this section
 for information you will need to get started.
 
-:::::::::::::::  solution
+:::::::::::::::  spoiler
 
 ## Read me
 
diff --git a/episodes/04-motion.md b/episodes/04-motion.md
index 49c35177..c761dba4 100644
--- a/episodes/04-motion.md
+++ b/episodes/04-motion.md
@@ -49,7 +49,7 @@ analysis, identifying stars with the proper motion we expect for GD-1.
 If you are starting a new notebook for this episode, expand this section
 for information you will need to get started.
 
-:::::::::::::::  solution
+:::::::::::::::  spoiler
 
 ## Read me
 
diff --git a/episodes/05-select.md b/episodes/05-select.md
index c6a8fd6c..642ecd5e 100644
--- a/episodes/05-select.md
+++ b/episodes/05-select.md
@@ -51,7 +51,7 @@ single query.
 If you are starting a new notebook for this episode, expand this section
 for information you will need to get started.
 
-:::::::::::::::  solution
+:::::::::::::::  spoiler
 
 ## Read me
 
diff --git a/episodes/06-join.md b/episodes/06-join.md
index 3373752f..1389aebd 100644
--- a/episodes/06-join.md
+++ b/episodes/06-join.md
@@ -61,7 +61,7 @@ main sequence of GD-1 from younger background stars.
 If you are starting a new notebook for this episode, expand this section
 for information you will need to get started.
 
-:::::::::::::::  solution
+:::::::::::::::  spoiler
 
 ## Read me
 
diff --git a/episodes/07-photo.md b/episodes/07-photo.md
index 32a5907c..9251145f 100644
--- a/episodes/07-photo.md
+++ b/episodes/07-photo.md
@@ -58,7 +58,7 @@ main sequence of GD-1 from mostly younger background stars.
 If you are starting a new notebook for this episode, expand this section
 for information you will need to get started.
 
-:::::::::::::::  solution
+:::::::::::::::  spoiler
 
 ## Read me
 
@@ -120,7 +120,7 @@ and i filters, which indicates color.
 If you are wondering (as a non-domain expert)
 how to interpret this color-magnitude diagram, please expand the section below.
 
-:::::::::::::::  solution
+:::::::::::::::  spoiler
 
 ## The color magnitude diagram of GD-1 and foreground stars
 
diff --git a/episodes/08-plot.md b/episodes/08-plot.md
index 3782d1cb..f0bc7cec 100644
--- a/episodes/08-plot.md
+++ b/episodes/08-plot.md
@@ -49,7 +49,7 @@ them to make a figure that tells a compelling scientific story.
 If you are starting a new notebook for this episode, expand this section
 for information you will need to get started.
 
-:::::::::::::::  solution
+:::::::::::::::  spoiler
 
 ## Read me