diff --git a/book/EVA/MUDE/01_02_3-1-Extreme_Value_notebook_dont_execute.ipynb b/book/EVA/MUDE/01_02_3-1-Extreme_Value_notebook.ipynb
similarity index 100%
rename from book/EVA/MUDE/01_02_3-1-Extreme_Value_notebook_dont_execute.ipynb
rename to book/EVA/MUDE/01_02_3-1-Extreme_Value_notebook.ipynb
diff --git a/book/EVA/MUDE/01_03_3-1-Extreme_Value_notebook_solved_dont_execute.ipynb b/book/EVA/MUDE/01_03_3-1-Extreme_Value_notebook_solved.ipynb
similarity index 100%
rename from book/EVA/MUDE/01_03_3-1-Extreme_Value_notebook_solved_dont_execute.ipynb
rename to book/EVA/MUDE/01_03_3-1-Extreme_Value_notebook_solved.ipynb
diff --git a/book/EVA/MUDE/01_05_4-1-EVA2_student_dont_execute.ipynb b/book/EVA/MUDE/01_05_4-1-EVA2_student.ipynb
similarity index 100%
rename from book/EVA/MUDE/01_05_4-1-EVA2_student_dont_execute.ipynb
rename to book/EVA/MUDE/01_05_4-1-EVA2_student.ipynb
diff --git a/book/EVA/MUDE/01_06_4-1-EVA2_teacher_dont_execute.ipynb b/book/EVA/MUDE/01_06_4-1-EVA2_teacher.ipynb
similarity index 100%
rename from book/EVA/MUDE/01_06_4-1-EVA2_teacher_dont_execute.ipynb
rename to book/EVA/MUDE/01_06_4-1-EVA2_teacher.ipynb
diff --git a/book/cookbook/benchmarks/benchmark_aux_dont_execute.ipynb b/book/cookbook/benchmarks/benchmark_aux.ipynb
similarity index 100%
rename from book/cookbook/benchmarks/benchmark_aux_dont_execute.ipynb
rename to book/cookbook/benchmarks/benchmark_aux.ipynb
diff --git a/book/cookbook/benchmarks/benchmark_load_dont_execute.ipynb b/book/cookbook/benchmarks/benchmark_load.ipynb
similarity index 100%
rename from book/cookbook/benchmarks/benchmark_load_dont_execute.ipynb
rename to book/cookbook/benchmarks/benchmark_load.ipynb
diff --git a/book/cookbook/benchmarks/benchmark_tags_dont_execute.ipynb b/book/cookbook/benchmarks/benchmark_tags.ipynb
similarity index 100%
rename from book/cookbook/benchmarks/benchmark_tags_dont_execute.ipynb
rename to book/cookbook/benchmarks/benchmark_tags.ipynb
diff --git a/book/cookbook/example_gumbel_dont_execute.ipynb b/book/cookbook/example_gumbel.ipynb
similarity index 100%
rename from book/cookbook/example_gumbel_dont_execute.ipynb
rename to book/cookbook/example_gumbel.ipynb
diff --git a/book/cookbook/exercise_checking_dont_execute.ipynb b/book/cookbook/exercise_checking.ipynb
similarity index 100%
rename from book/cookbook/exercise_checking_dont_execute.ipynb
rename to book/cookbook/exercise_checking.ipynb
diff --git a/book/cookbook/widgets_dont_execute.ipynb b/book/cookbook/widgets.ipynb
similarity index 100%
rename from book/cookbook/widgets_dont_execute.ipynb
rename to book/cookbook/widgets.ipynb
diff --git a/book/old/coding/1-1/1-1-solution_dont_execute.ipynb b/book/old/coding/1-1/1-1-solution.ipynb
similarity index 100%
rename from book/old/coding/1-1/1-1-solution_dont_execute.ipynb
rename to book/old/coding/1-1/1-1-solution.ipynb
diff --git a/book/old/coding/1-1/1-1-student_dont_execute.ipynb b/book/old/coding/1-1/1-1-student.ipynb
similarity index 100%
rename from book/old/coding/1-1/1-1-student_dont_execute.ipynb
rename to book/old/coding/1-1/1-1-student.ipynb
diff --git a/book/old/coding/1-1/1-2-solution_dont_execute.ipynb b/book/old/coding/1-1/1-2-solution.ipynb
similarity index 100%
rename from book/old/coding/1-1/1-2-solution_dont_execute.ipynb
rename to book/old/coding/1-1/1-2-solution.ipynb
diff --git a/book/old/coding/1-1/1-2-student_dont_execute.ipynb b/book/old/coding/1-1/1-2-student.ipynb
similarity index 100%
rename from book/old/coding/1-1/1-2-student_dont_execute.ipynb
rename to book/old/coding/1-1/1-2-student.ipynb
diff --git a/book/old/coding/1-2-Golden_Rules_dont_execute.ipynb b/book/old/coding/1-2-Golden_Rules.ipynb
similarity index 100%
rename from book/old/coding/1-2-Golden_Rules_dont_execute.ipynb
rename to book/old/coding/1-2-Golden_Rules.ipynb
diff --git a/book/old/coding/1-4/1-1-testing-solution_dont_execute.ipynb b/book/old/coding/1-4/1-1-testing-solution.ipynb
similarity index 100%
rename from book/old/coding/1-4/1-1-testing-solution_dont_execute.ipynb
rename to book/old/coding/1-4/1-1-testing-solution.ipynb
diff --git a/book/old/coding/1-4/1-1-testing-student_dont_execute.ipynb b/book/old/coding/1-4/1-1-testing-student.ipynb
similarity index 100%
rename from book/old/coding/1-4/1-1-testing-student_dont_execute.ipynb
rename to book/old/coding/1-4/1-1-testing-student.ipynb
diff --git a/book/old/coding/1-4/1-2-oop-solution_dont_execute.ipynb b/book/old/coding/1-4/1-2-oop-solution.ipynb
similarity index 100%
rename from book/old/coding/1-4/1-2-oop-solution_dont_execute.ipynb
rename to book/old/coding/1-4/1-2-oop-solution.ipynb
diff --git a/book/old/coding/1-4/1-2-oop-student_dont_execute.ipynb b/book/old/coding/1-4/1-2-oop-student.ipynb
similarity index 100%
rename from book/old/coding/1-4/1-2-oop-student_dont_execute.ipynb
rename to book/old/coding/1-4/1-2-oop-student.ipynb
diff --git a/book/old/coding/1-4/1-3-modules-solution_dont_execute.ipynb b/book/old/coding/1-4/1-3-modules-solution.ipynb
similarity index 100%
rename from book/old/coding/1-4/1-3-modules-solution_dont_execute.ipynb
rename to book/old/coding/1-4/1-3-modules-solution.ipynb
diff --git a/book/old/coding/1-4/1-3-modules-student_dont_execute.ipynb b/book/old/coding/1-4/1-3-modules-student.ipynb
similarity index 100%
rename from book/old/coding/1-4/1-3-modules-student_dont_execute.ipynb
rename to book/old/coding/1-4/1-3-modules-student.ipynb
diff --git a/book/old/coding/1-6/1_1_Introduction_student_dont_execute.ipynb b/book/old/coding/1-6/1_1_Introduction_student.ipynb
similarity index 100%
rename from book/old/coding/1-6/1_1_Introduction_student_dont_execute.ipynb
rename to book/old/coding/1-6/1_1_Introduction_student.ipynb
diff --git a/book/old/coding/1-6/1_2_Points_student_dont_execute.ipynb b/book/old/coding/1-6/1_2_Points_student.ipynb
similarity index 100%
rename from book/old/coding/1-6/1_2_Points_student_dont_execute.ipynb
rename to book/old/coding/1-6/1_2_Points_student.ipynb
diff --git a/book/old/coding/1-6/1_3_Lines_student_dont_execute.ipynb b/book/old/coding/1-6/1_3_Lines_student.ipynb
similarity index 100%
rename from book/old/coding/1-6/1_3_Lines_student_dont_execute.ipynb
rename to book/old/coding/1-6/1_3_Lines_student.ipynb
diff --git a/book/old/coding/1-6/1_4_Polygons_student_dont_execute.ipynb b/book/old/coding/1-6/1_4_Polygons_student.ipynb
similarity index 100%
rename from book/old/coding/1-6/1_4_Polygons_student_dont_execute.ipynb
rename to book/old/coding/1-6/1_4_Polygons_student.ipynb
diff --git a/book/old/coding/1-6/1_5_Rasters_student_dont_execute.ipynb b/book/old/coding/1-6/1_5_Rasters_student.ipynb
similarity index 100%
rename from book/old/coding/1-6/1_5_Rasters_student_dont_execute.ipynb
rename to book/old/coding/1-6/1_5_Rasters_student.ipynb
diff --git a/book/old/coding/1-6/1_6_Lines_teacher_dont_execute.ipynb b/book/old/coding/1-6/1_6_Lines_teacher.ipynb
similarity index 100%
rename from book/old/coding/1-6/1_6_Lines_teacher_dont_execute.ipynb
rename to book/old/coding/1-6/1_6_Lines_teacher.ipynb
diff --git a/book/old/coding/1-6/1_7_Polygons_teacher_dont_execute.ipynb b/book/old/coding/1-6/1_7_Polygons_teacher.ipynb
similarity index 100%
rename from book/old/coding/1-6/1_7_Polygons_teacher_dont_execute.ipynb
rename to book/old/coding/1-6/1_7_Polygons_teacher.ipynb
diff --git a/book/old/coding/1-6/1_8_Rasters_teacher_dont_execute.ipynb b/book/old/coding/1-6/1_8_Rasters_teacher.ipynb
similarity index 100%
rename from book/old/coding/1-6/1_8_Rasters_teacher_dont_execute.ipynb
rename to book/old/coding/1-6/1_8_Rasters_teacher.ipynb
diff --git a/book/old/coding/2-2/1_1_dont_execute.ipynb b/book/old/coding/2-2/1_1.ipynb
similarity index 100%
rename from book/old/coding/2-2/1_1_dont_execute.ipynb
rename to book/old/coding/2-2/1_1.ipynb
diff --git a/book/old/coding/2-2/1_2_dont_execute.ipynb b/book/old/coding/2-2/1_2.ipynb
similarity index 100%
rename from book/old/coding/2-2/1_2_dont_execute.ipynb
rename to book/old/coding/2-2/1_2.ipynb
diff --git a/book/pd/notebooks/contamination/Exercise_Contamination_Render_dont_execute.ipynb b/book/pd/notebooks/contamination/Exercise_Contamination_Render.ipynb
similarity index 100%
rename from book/pd/notebooks/contamination/Exercise_Contamination_Render_dont_execute.ipynb
rename to book/pd/notebooks/contamination/Exercise_Contamination_Render.ipynb
diff --git a/book/pd/notebooks/flood-risk/Exercise_Flood_Risk_Render_dont_execute.ipynb b/book/pd/notebooks/flood-risk/Exercise_Flood_Risk_Render.ipynb
similarity index 100%
rename from book/pd/notebooks/flood-risk/Exercise_Flood_Risk_Render_dont_execute.ipynb
rename to book/pd/notebooks/flood-risk/Exercise_Flood_Risk_Render.ipynb
diff --git a/book/pd/notebooks/traffic/Exercise_Traffic_Render_dont_execute.ipynb b/book/pd/notebooks/traffic/Exercise_Traffic_Render.ipynb
similarity index 100%
rename from book/pd/notebooks/traffic/Exercise_Traffic_Render_dont_execute.ipynb
rename to book/pd/notebooks/traffic/Exercise_Traffic_Render.ipynb
diff --git a/book/programming/golden_rules_dont_execute.ipynb b/book/programming/golden_rules.ipynb
similarity index 100%
rename from book/programming/golden_rules_dont_execute.ipynb
rename to book/programming/golden_rules.ipynb
diff --git a/book/sandbox/ObservationTheory/02_Notebook_LeastSquares_dont_execute.ipynb b/book/sandbox/ObservationTheory/02_Notebook_LeastSquares.ipynb
similarity index 100%
rename from book/sandbox/ObservationTheory/02_Notebook_LeastSquares_dont_execute.ipynb
rename to book/sandbox/ObservationTheory/02_Notebook_LeastSquares.ipynb
diff --git a/book/sandbox/dist_fit_example/00_case_study_dont_execute.ipynb b/book/sandbox/dist_fit_example/00_case_study.ipynb
similarity index 100%
rename from book/sandbox/dist_fit_example/00_case_study_dont_execute.ipynb
rename to book/sandbox/dist_fit_example/00_case_study.ipynb
diff --git a/book/sandbox/dist_fit_example/01_importdata_dont_execute.ipynb b/book/sandbox/dist_fit_example/01_importdata.ipynb
similarity index 100%
rename from book/sandbox/dist_fit_example/01_importdata_dont_execute.ipynb
rename to book/sandbox/dist_fit_example/01_importdata.ipynb
diff --git a/book/sandbox/dist_fit_example/02_distributionfitting_dont_execute.ipynb b/book/sandbox/dist_fit_example/02_distributionfitting.ipynb
similarity index 100%
rename from book/sandbox/dist_fit_example/02_distributionfitting_dont_execute.ipynb
rename to book/sandbox/dist_fit_example/02_distributionfitting.ipynb
diff --git a/book/sandbox/multivariate/Multivariate_dont_execute.ipynb b/book/sandbox/multivariate/Multivariate.ipynb
similarity index 100%
rename from book/sandbox/multivariate/Multivariate_dont_execute.ipynb
rename to book/sandbox/multivariate/Multivariate.ipynb
diff --git a/book/sandbox/multivariate/Vessels_dont_execute.ipynb b/book/sandbox/multivariate/Vessels.ipynb
similarity index 100%
rename from book/sandbox/multivariate/Vessels_dont_execute.ipynb
rename to book/sandbox/multivariate/Vessels.ipynb