diff --git a/lib/recipes/astronomy/recipe.rb b/lib/recipes/astronomy/recipe.rb
index 60d4eb500..416023e27 100644
--- a/lib/recipes/astronomy/recipe.rb
+++ b/lib/recipes/astronomy/recipe.rb
@@ -55,6 +55,8 @@
         append_to: exercises_composite_chapter
       ) do |section|
         RemoveSectionTitle.v1(section: section)
+        title = EocSectionTitleLinkSnippet.v1(page: section.ancestor(:page))
+        section.prepend(child: title)
       end
     end
     exercises_composite_chapter.exercises.each do |exercise|
diff --git a/lib/recipes/business-ethics/recipe.rb b/lib/recipes/business-ethics/recipe.rb
index 4fb3caf7d..0b9bf0af7 100644
--- a/lib/recipes/business-ethics/recipe.rb
+++ b/lib/recipes/business-ethics/recipe.rb
@@ -67,6 +67,8 @@
         section_selector: "section.#{section_key}"
       ) do |section|
         RemoveSectionTitle.v1(section: section)
+        title = EocSectionTitleLinkSnippet.v1(page: section.ancestor(:page))
+        section.prepend(child: title)
       end
     end
 
diff --git a/lib/recipes/economics/recipe.rb b/lib/recipes/economics/recipe.rb
index b37ec3784..b7a06476f 100644
--- a/lib/recipes/economics/recipe.rb
+++ b/lib/recipes/economics/recipe.rb
@@ -28,14 +28,24 @@
     BakeChapterSummary.v1(chapter: chapter, metadata_source: metadata)
 
     exercise_section_classes = \
-      %w[summary self-check-questions review-questions critical-thinking problems]
+      %w[self-check-questions review-questions critical-thinking problems]
 
     chapter.search(exercise_section_classes.prefix('section.')).exercises.each do |exercise|
       BakeNumberedExercise.v1(exercise: exercise, number: exercise.count_in(:chapter))
     end
 
-    exercise_section_classes.each do |klass|
-      MoveExercisesToEOC.v1(chapter: chapter, metadata_source: metadata, klass: klass)
+    exercise_section_classes.each do |section_key|
+      MoveCustomSectionToEocContainer.v1(
+        chapter: chapter,
+        metadata_source: metadata,
+        container_key: section_key,
+        uuid_key: ".#{section_key}",
+        section_selector: "section.#{section_key}"
+      ) do |section|
+        RemoveSectionTitle.v1(section: section)
+        title = EocSectionTitleLinkSnippet.v1(page: section.ancestor(:page))
+        section.prepend(child: title)
+      end
     end
 
     answer_key_inner_container = AnswerKeyInnerContainer.v1(
diff --git a/lib/recipes/microbiology/recipe.rb b/lib/recipes/microbiology/recipe.rb
index b0ac692e6..bfbf9662a 100644
--- a/lib/recipes/microbiology/recipe.rb
+++ b/lib/recipes/microbiology/recipe.rb
@@ -35,13 +35,19 @@
     exercise_section_classes = %w[multiple-choice true-false matching
                                   fill-in-the-blank short-answer critical-thinking]
 
-    exercise_section_classes.each do |klass|
-      MoveExercisesToEOC.v1(
+    exercise_section_classes.each do |section_key|
+      MoveCustomSectionToEocContainer.v1(
         chapter: chapter,
         metadata_source: metadata,
-        append_to: eoc_wrapper,
-        klass: klass
-      )
+        container_key: section_key,
+        uuid_key: ".#{section_key}",
+        section_selector: "section.#{section_key}",
+        append_to: eoc_wrapper
+      ) do |section|
+        RemoveSectionTitle.v1(section: section)
+        title = EocSectionTitleLinkSnippet.v1(page: section.ancestor(:page))
+        section.prepend(child: title)
+      end
     end
 
     chapter.search(exercise_section_classes.prefix('section.').join(', ')).exercises