From 27a54624c3ab724e64038727be0744138a9080f4 Mon Sep 17 00:00:00 2001
From: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Date: Thu, 23 Oct 2025 19:50:15 +0200
Subject: [PATCH] refactor: blockType -> blockLabel (#62548)

Co-authored-by: Huyen Nguyen <25715018+huyenltnguyen@users.noreply.github.com>
---
 client/gatsby-node.js                         |  4 +-
 client/src/redux/prop-types.ts                |  5 +--
 .../src/templates/Challenges/generic/show.tsx |  6 +--
 .../Challenges/redux/completion-epic.js       |  3 +-
 .../src/templates/Challenges/redux/index.js   |  1 -
 .../Introduction/components/block-header.tsx  |  8 ++--
 .../Introduction/components/block-label.tsx   | 10 ++---
 .../Introduction/components/block.test.tsx    |  6 +--
 .../Introduction/components/block.tsx         | 18 ++++-----
 .../components/super-block-accordion.tsx      | 10 ++---
 .../Introduction/super-block-intro.tsx        | 10 ++---
 curriculum/schema/challenge-schema.js         |  2 +-
 curriculum/schema/meta-schema.js              |  2 +-
 curriculum/src/build-superblock.test.js       |  4 +-
 curriculum/src/build-superblock.ts            |  2 +-
 curriculum/src/file-handler.ts                |  4 +-
 .../structure/blocks/cat-blog-page.json       |  2 +-
 .../structure/blocks/cat-photo-app.json       |  2 +-
 .../es-a1-learn-alphabet-and-accents.json     |  2 +-
 ...s-a1-learn-certification-introduction.json |  2 +-
 .../es-a1-learn-greetings-during-the-day.json |  2 +-
 .../es-a1-learn-meet-angela-and-basti.json    |  2 +-
 .../blocks/es-a1-learn-meet-julieta.json      |  2 +-
 .../blocks/es-a1-learn-meet-luna.json         |  2 +-
 .../blocks/es-a1-learn-meet-mateo.json        |  2 +-
 .../blocks/es-a1-learn-punctuation.json       |  2 +-
 .../es-a1-practice-first-questions.json       |  2 +-
 ...s-a1-practice-greetings-and-farewells.json |  2 +-
 .../es-a1-practice-introducing-yourself.json  |  2 +-
 ...-alphabet-accent-and-punctuation-quiz.json |  2 +-
 .../blocks/es-a1-quiz-first-questions.json    |  2 +-
 .../es-a1-quiz-greetings-and-farewells.json   |  2 +-
 .../es-a1-quiz-introducing-yourself.json      |  2 +-
 .../blocks/es-a1-review-first-questions.json  |  2 +-
 .../es-a1-review-greetings-and-farewells.json |  2 +-
 .../es-a1-review-introducing-yourself.json    |  2 +-
 .../es-a1-warm-up-first-questions-basics.json |  2 +-
 ...arm-up-greetings-and-farewells-basics.json |  2 +-
 ...1-warm-up-introducing-yourself-basics.json |  2 +-
 curriculum/structure/blocks/event-hub.json    |  2 +-
 ...nd-development-and-apis-certification.json |  2 +-
 .../exam-certified-full-stack-developer.json  |  2 +-
 ...d-development-libraries-certification.json |  2 +-
 .../blocks/exam-javascript-certification.json |  2 +-
 .../blocks/exam-python-certification.json     |  2 +-
 ...am-relational-databases-certification.json |  2 +-
 ...m-responsive-web-design-certification.json |  2 +-
 ...ab-adjacency-list-to-matrix-converter.json |  2 +-
 .../lab-all-true-property-validator.json      |  2 +-
 .../blocks/lab-availability-table.json        |  2 +-
 .../blocks/lab-bank-account-manager.json      |  2 +-
 .../blocks/lab-bisection-method.json          |  2 +-
 .../structure/blocks/lab-blog-post-card.json  |  2 +-
 .../blocks/lab-book-catalog-table.json        |  2 +-
 .../blocks/lab-book-inventory-app.json        |  2 +-
 .../structure/blocks/lab-book-organizer.json  |  2 +-
 .../blocks/lab-bookmark-manager-app.json      |  2 +-
 .../structure/blocks/lab-boolean-check.json   |  2 +-
 .../structure/blocks/lab-budget-app.json      |  2 +-
 .../structure/blocks/lab-business-card.json   |  2 +-
 .../blocks/lab-celestial-bodies-database.json |  2 +-
 .../lab-celsius-to-fahrenheit-converter.json  |  2 +-
 .../structure/blocks/lab-checkout-page.json   |  2 +-
 .../structure/blocks/lab-chunky-monkey.json   |  2 +-
 .../structure/blocks/lab-color-picker.json    |  2 +-
 .../structure/blocks/lab-colored-boxes.json   |  2 +-
 .../blocks/lab-confidential-email-page.json   |  2 +-
 .../structure/blocks/lab-contact-form.json    |  2 +-
 .../structure/blocks/lab-counting-cards.json  |  2 +-
 .../blocks/lab-currency-converter.json        |  2 +-
 .../blocks/lab-customer-complaint-form.json   |  2 +-
 .../structure/blocks/lab-date-conversion.json |  2 +-
 .../lab-debug-camperbots-profile-page.json    |  2 +-
 .../blocks/lab-debug-pet-adoption-page.json   |  2 +-
 .../blocks/lab-deep-flattening-tool.json      |  2 +-
 .../blocks/lab-depth-first-search.json        |  2 +-
 .../blocks/lab-dna-pair-generator.json        |  2 +-
 .../structure/blocks/lab-drum-machine.json    |  2 +-
 .../structure/blocks/lab-element-skipper.json |  2 +-
 .../structure/blocks/lab-email-masker.json    |  2 +-
 .../blocks/lab-event-flyer-page.json          |  2 +-
 .../structure/blocks/lab-event-hub.json       |  2 +-
 .../structure/blocks/lab-event-rsvp.json      |  2 +-
 .../blocks/lab-factorial-calculator.json      |  2 +-
 .../structure/blocks/lab-falsy-remover.json   |  2 +-
 .../blocks/lab-favorite-icon-toggler.json     |  2 +-
 .../blocks/lab-fcc-forum-leaderboard.json     |  2 +-
 .../blocks/lab-feature-selection.json         |  2 +-
 .../blocks/lab-first-element-finder.json      |  2 +-
 .../blocks/lab-football-team-cards.json       |  2 +-
 .../structure/blocks/lab-fortune-teller.json  |  2 +-
 .../blocks/lab-golf-score-translator.json     |  2 +-
 .../structure/blocks/lab-gradebook-app.json   |  2 +-
 .../structure/blocks/lab-hash-table.json      |  2 +-
 .../structure/blocks/lab-house-painting.json  |  2 +-
 .../lab-html-audio-and-video-player.json      |  2 +-
 .../blocks/lab-html-entitiy-converter.json    |  2 +-
 .../lab-inventory-management-program.json     |  2 +-
 .../structure/blocks/lab-isbn-validator.json  |  2 +-
 .../blocks/lab-javascript-trivia-bot.json     |  2 +-
 .../blocks/lab-job-application-form.json      |  2 +-
 .../blocks/lab-largest-number-finder.json     |  2 +-
 .../blocks/lab-leap-year-calculator.json      |  2 +-
 .../structure/blocks/lab-lightbox-viewer.json |  2 +-
 .../blocks/lab-longest-word-in-a-string.json  |  2 +-
 .../structure/blocks/lab-luhn-algorithm.json  |  2 +-
 .../blocks/lab-lunch-picker-program.json      |  2 +-
 .../lab-markdown-to-html-converter.json       |  2 +-
 .../blocks/lab-matching-object-filter.json    |  2 +-
 .../blocks/lab-missing-letter-detector.json   |  2 +-
 .../structure/blocks/lab-mood-board.json      |  2 +-
 .../structure/blocks/lab-moon-orbit.json      |  2 +-
 .../blocks/lab-movie-review-page.json         |  2 +-
 .../blocks/lab-multimedia-player.json         |  2 +-
 .../blocks/lab-music-shopping-cart-page.json  |  2 +-
 .../structure/blocks/lab-mutations.json       |  2 +-
 .../blocks/lab-n-queens-problem.json          |  2 +-
 .../blocks/lab-newspaper-article.json         |  2 +-
 .../blocks/lab-newspaper-layout.json          |  2 +-
 .../blocks/lab-nth-fibonacci-number.json      |  2 +-
 .../blocks/lab-number-guessing-game.json      |  2 +-
 .../blocks/lab-number-pattern-generator.json  |  2 +-
 .../lab-odd-fibonacci-sum-calculator.json     |  2 +-
 .../lab-one-time-password-generator.json      |  2 +-
 .../lab-optional-arguments-sum-function.json  |  2 +-
 .../blocks/lab-page-of-playing-cards.json     |  2 +-
 .../blocks/lab-palindrome-checker.json        |  2 +-
 .../blocks/lab-password-generator.json        |  2 +-
 .../blocks/lab-periodic-table-database.json   |  2 +-
 .../blocks/lab-permutation-generator.json     |  2 +-
 .../blocks/lab-personal-portfolio.json        |  2 +-
 .../blocks/lab-photography-exhibit.json       |  2 +-
 .../structure/blocks/lab-pig-latin.json       |  2 +-
 .../blocks/lab-polygon-area-calculator.json   |  2 +-
 .../lab-prime-number-sum-calculator.json      |  2 +-
 .../blocks/lab-product-landing-page.json      |  2 +-
 .../structure/blocks/lab-profile-lookup.json  |  2 +-
 .../blocks/lab-project-idea-board.json        |  2 +-
 .../blocks/lab-pyramid-generator.json         |  2 +-
 .../structure/blocks/lab-quicksort.json       |  2 +-
 .../structure/blocks/lab-quiz-game.json       |  2 +-
 .../lab-random-background-color-changer.json  |  2 +-
 .../lab-range-based-lcm-calculator.json       |  2 +-
 .../blocks/lab-real-time-counter.json         |  2 +-
 .../structure/blocks/lab-recipe-page.json     |  2 +-
 .../blocks/lab-record-collection.json         |  2 +-
 .../structure/blocks/lab-regex-sandbox.json   |  2 +-
 .../structure/blocks/lab-repeat-a-string.json |  2 +-
 .../structure/blocks/lab-reusable-footer.json |  2 +-
 .../blocks/lab-reverse-a-string.json          |  2 +-
 .../structure/blocks/lab-rpg-character.json   |  2 +-
 .../lab-salon-appointment-scheduler.json      |  2 +-
 .../structure/blocks/lab-selection-sort.json  |  2 +-
 .../structure/blocks/lab-sentence-maker.json  |  2 +-
 .../blocks/lab-slice-and-splice.json          |  2 +-
 .../blocks/lab-smart-word-replacement.json    |  2 +-
 .../blocks/lab-sorted-index-finder.json       |  2 +-
 .../blocks/lab-sorting-visualizer.json        |  2 +-
 .../blocks/lab-spinal-case-converter.json     |  2 +-
 .../blocks/lab-string-ending-checker.json     |  2 +-
 .../blocks/lab-stylized-to-do-list.json       |  2 +-
 .../blocks/lab-sum-all-numbers-algorithm.json |  2 +-
 .../structure/blocks/lab-survey-form.json     |  2 +-
 .../blocks/lab-symmetric-difference.json      |  2 +-
 .../lab-technical-documentation-page.json     |  2 +-
 .../structure/blocks/lab-theme-switcher.json  |  2 +-
 .../structure/blocks/lab-tic-tac-toe.json     |  2 +-
 .../blocks/lab-title-case-converter.json      |  2 +-
 .../structure/blocks/lab-tower-of-hanoi.json  |  2 +-
 .../blocks/lab-travel-agency-page.json        |  2 +-
 .../structure/blocks/lab-tribute-page.json    |  2 +-
 .../structure/blocks/lab-truncate-string.json |  2 +-
 .../blocks/lab-unique-sorted-union.json       |  2 +-
 .../lab-user-configuration-manager.json       |  2 +-
 .../blocks/lab-value-remover-function.json    |  2 +-
 .../blocks/lab-video-compilation-page.json    |  2 +-
 .../structure/blocks/lab-voting-system.json   |  2 +-
 .../structure/blocks/lab-weather-app.json     |  2 +-
 .../blocks/lab-world-cup-database.json        |  2 +-
 .../lecture-accessible-media-elements.json    |  2 +-
 .../lecture-accessible-tables-forms.json      |  2 +-
 .../lecture-animations-and-accessibility.json |  2 +-
 ...t-practices-for-accessibility-and-css.json |  2 +-
 ...t-practices-for-responsive-web-design.json |  2 +-
 ...ture-best-practices-for-styling-forms.json |  2 +-
 .../lecture-browsing-the-web-effectively.json |  2 +-
 .../blocks/lecture-classes-and-objects.json   |  2 +-
 .../blocks/lecture-common-design-tools.json   |  2 +-
 ...the-cascade-algorithm-and-inheritance.json |  2 +-
 .../blocks/lecture-debugging-css.json         |  2 +-
 .../blocks/lecture-debugging-techniques.json  |  2 +-
 .../blocks/lecture-html-fundamentals.json     |  2 +-
 ...accessibility-and-good-html-structure.json |  2 +-
 .../lecture-importance-of-semantic-html.json  |  2 +-
 .../blocks/lecture-introduction-to-aria.json  |  2 +-
 ...ecture-introduction-to-git-and-github.json |  2 +-
 ...o-javascript-libraries-and-frameworks.json |  2 +-
 ...vascript-objects-and-their-properties.json |  2 +-
 .../lecture-introduction-to-javascript.json   |  2 +-
 .../lecture-introduction-to-python.json       |  2 +-
 .../lecture-introduction-to-strings.json      |  2 +-
 .../lecture-introduction-to-typescript.json   |  2 +-
 ...ecture-react-strategies-and-debugging.json |  2 +-
 ...works-and-dependency-management-tools.json |  2 +-
 ...ture-searching-and-sorting-algorithms.json |  2 +-
 .../lecture-styling-lists-and-links.json      |  2 +-
 .../lecture-the-var-keyword-and-hoisting.json |  2 +-
 .../lecture-understanding-abstraction.json    |  2 +-
 ...nded-aria-live-and-common-aria-states.json |  2 +-
 ...nderstanding-asynchronous-programming.json |  2 +-
 .../lecture-understanding-bash-scripting.json |  2 +-
 .../lecture-understanding-code-clarity.json   |  2 +-
 ...standing-comparisons-and-conditionals.json |  2 +-
 ...-computer-internet-and-tooling-basics.json |  2 +-
 ...ure-understanding-dynamic-programming.json |  2 +-
 ...fects-and-referencing-values-in-react.json |  2 +-
 .../lecture-understanding-error-handling.json |  2 +-
 ...lecture-understanding-form-validation.json |  2 +-
 ...-understanding-functional-programming.json |  2 +-
 ...ecture-understanding-graphs-and-trees.json |  2 +-
 ...re-understanding-how-html-affects-seo.json |  2 +-
 ...ow-to-work-with-classes-in-javascript.json |  2 +-
 ...rk-with-floats-and-positioning-in-css.json |  2 +-
 ...lecture-understanding-html-attributes.json |  2 +-
 ...standing-inheritance-and-polymorphism.json |  2 +-
 ...rstanding-modules-imports-and-exports.json |  2 +-
 ...derstanding-nuanced-semantic-elements.json |  2 +-
 ...riented-programming-and-encapsulation.json |  2 +-
 ...nding-performance-in-web-applications.json |  2 +-
 ...standing-recursion-and-the-call-stack.json |  2 +-
 ...he-command-line-and-working-with-bash.json |  2 +-
 ...anding-the-different-types-of-testing.json |  2 +-
 ...the-event-object-and-event-delegation.json |  2 +-
 ...re-understanding-the-html-boilerplate.json |  2 +-
 ...nding-the-http-request-response-model.json |  2 +-
 .../blocks/lecture-user-centered-design.json  |  2 +-
 ...re-user-interface-design-fundamentals.json |  2 +-
 .../structure/blocks/lecture-what-is-css.json |  2 +-
 ...arrays-variables-and-naming-practices.json |  2 +-
 .../blocks/lecture-working-with-arrays.json   |  2 +-
 ...ture-working-with-attribute-selectors.json |  2 +-
 ...working-with-audio-and-video-elements.json |  2 +-
 .../lecture-working-with-audio-and-video.json |  2 +-
 ...-working-with-backgrounds-and-borders.json |  2 +-
 ...ient-side-storage-and-crud-operations.json |  2 +-
 ...re-working-with-code-editors-and-ides.json |  2 +-
 ...h-code-quality-and-execution-concepts.json |  2 +-
 ...eviews-branching-deployment-and-ci-cd.json |  2 +-
 .../lecture-working-with-colors-in-css.json   |  2 +-
 ...ure-working-with-common-array-methods.json |  2 +-
 ...e-working-with-common-data-structures.json |  2 +-
 ...with-comparison-and-boolean-operators.json |  2 +-
 ...th-conditional-logic-and-math-methods.json |  2 +-
 .../lecture-working-with-css-flexbox.json     |  2 +-
 .../lecture-working-with-css-fonts.json       |  2 +-
 .../blocks/lecture-working-with-css-grid.json |  2 +-
 ...ing-with-css-libraries-and-frameworks.json |  2 +-
 ...h-css-transforms-overflow-and-filters.json |  2 +-
 .../lecture-working-with-css-variables.json   |  2 +-
 ...ata-fetching-and-memoization-in-react.json |  2 +-
 .../lecture-working-with-data-in-react.json   |  2 +-
 .../lecture-working-with-data-types.json      |  2 +-
 .../blocks/lecture-working-with-dates.json    |  2 +-
 ...re-working-with-dictionaries-and-sets.json |  2 +-
 .../lecture-working-with-file-systems.json    |  2 +-
 .../lecture-working-with-forms-in-react.json  |  2 +-
 .../blocks/lecture-working-with-forms.json    |  2 +-
 .../lecture-working-with-functions.json       |  2 +-
 ...king-with-generics-and-type-narrowing.json |  2 +-
 ...-higher-order-functions-and-callbacks.json |  2 +-
 .../lecture-working-with-html-tools.json      |  2 +-
 .../lecture-working-with-images-and-svgs.json |  2 +-
 .../blocks/lecture-working-with-json.json     |  2 +-
 .../blocks/lecture-working-with-links.json    |  2 +-
 ...ture-working-with-loops-and-sequences.json |  2 +-
 .../blocks/lecture-working-with-loops.json    |  2 +-
 .../lecture-working-with-maps-and-sets.json   |  2 +-
 .../blocks/lecture-working-with-media.json    |  2 +-
 .../blocks/lecture-working-with-modules.json  |  2 +-
 .../blocks/lecture-working-with-nano.json     |  2 +-
 ...with-numbers-and-arithmetic-operators.json |  2 +-
 ...ith-numbers-and-common-number-methods.json |  2 +-
 ...ecture-working-with-operator-behavior.json |  2 +-
 ...nal-chaining-and-object-destructuring.json |  2 +-
 ...do-classes-and-pseudo-elements-in-css.json |  2 +-
 ...ture-working-with-regular-expressions.json |  2 +-
 ...ure-working-with-relational-databases.json |  2 +-
 ...king-with-relative-and-absolute-units.json |  2 +-
 ...ng-with-specialized-semantic-elements.json |  2 +-
 .../blocks/lecture-working-with-sql.json      |  2 +-
 ...ate-and-responding-to-events-in-react.json |  2 +-
 ...working-with-string-character-methods.json |  2 +-
 ...orking-with-string-formatting-methods.json |  2 +-
 ...king-with-string-modification-methods.json |  2 +-
 ...-with-string-search-and-slice-methods.json |  2 +-
 ...re-working-with-strings-in-javascript.json |  2 +-
 .../blocks/lecture-working-with-tables.json   |  2 +-
 ...-with-text-and-time-semantic-elements.json |  2 +-
 ...-arguments-object-and-rest-parameters.json |  2 +-
 ...ith-the-dom-click-events-and-web-apis.json |  2 +-
 ...ecture-working-with-types-and-objects.json |  2 +-
 ...g-with-typescript-configuration-files.json |  2 +-
 ...king-with-unary-and-bitwise-operators.json |  2 +-
 .../blocks/quiz-asynchronous-javascript.json  |  2 +-
 .../structure/blocks/quiz-bash-and-sql.json   |  2 +-
 .../structure/blocks/quiz-bash-commands.json  |  2 +-
 .../structure/blocks/quiz-bash-scripting.json |  2 +-
 .../structure/blocks/quiz-basic-css.json      |  2 +-
 .../structure/blocks/quiz-basic-html.json     |  2 +-
 .../blocks/quiz-classes-and-objects.json      |  2 +-
 .../blocks/quiz-computer-basics.json          |  2 +-
 .../blocks/quiz-css-accessibility.json        |  2 +-
 .../structure/blocks/quiz-css-animations.json |  2 +-
 .../blocks/quiz-css-attribute-selectors.json  |  2 +-
 .../quiz-css-backgrounds-and-borders.json     |  2 +-
 .../structure/blocks/quiz-css-colors.json     |  2 +-
 .../structure/blocks/quiz-css-flexbox.json    |  2 +-
 .../structure/blocks/quiz-css-grid.json       |  2 +-
 .../blocks/quiz-css-layout-and-effects.json   |  2 +-
 .../quiz-css-libraries-and-frameworks.json    |  2 +-
 .../blocks/quiz-css-positioning.json          |  2 +-
 .../blocks/quiz-css-pseudo-classes.json       |  2 +-
 .../quiz-css-relative-and-absolute-units.json |  2 +-
 .../structure/blocks/quiz-css-typography.json |  2 +-
 .../structure/blocks/quiz-css-variables.json  |  2 +-
 .../blocks/quiz-data-structures.json          |  2 +-
 .../blocks/quiz-debugging-javascript.json     |  2 +-
 .../blocks/quiz-design-fundamentals.json      |  2 +-
 .../blocks/quiz-dictionaries-and-sets.json    |  2 +-
 ...ation-and-click-event-with-javascript.json |  2 +-
 .../blocks/quiz-dynamic-programming.json      |  2 +-
 .../structure/blocks/quiz-error-handling.json |  2 +-
 .../quiz-form-validation-with-javascript.json |  2 +-
 curriculum/structure/blocks/quiz-git.json     |  2 +-
 .../blocks/quiz-graphs-and-trees.json         |  2 +-
 .../blocks/quiz-html-accessibility.json       |  2 +-
 .../blocks/quiz-html-tables-and-forms.json    |  2 +-
 .../blocks/quiz-javascript-arrays.json        |  2 +-
 .../quiz-javascript-audio-and-video.json      |  2 +-
 .../blocks/quiz-javascript-classes.json       |  2 +-
 ...vascript-comparisons-and-conditionals.json |  2 +-
 .../blocks/quiz-javascript-dates.json         |  2 +-
 ...uiz-javascript-functional-programming.json |  2 +-
 .../blocks/quiz-javascript-functions.json     |  2 +-
 .../blocks/quiz-javascript-fundamentals.json  |  2 +-
 ...uiz-javascript-higher-order-functions.json |  2 +-
 .../blocks/quiz-javascript-loops.json         |  2 +-
 .../blocks/quiz-javascript-maps-and-sets.json |  2 +-
 .../blocks/quiz-javascript-math.json          |  2 +-
 .../blocks/quiz-javascript-objects.json       |  2 +-
 .../quiz-javascript-regular-expressions.json  |  2 +-
 .../blocks/quiz-javascript-strings.json       |  2 +-
 ...z-javascript-variables-and-data-types.json |  2 +-
 curriculum/structure/blocks/quiz-js-a11y.json |  2 +-
 .../blocks/quiz-local-storage-and-crud.json   |  2 +-
 .../blocks/quiz-loops-and-sequences.json      |  2 +-
 .../quiz-object-oriented-programming.json     |  2 +-
 .../structure/blocks/quiz-python-basics.json  |  2 +-
 .../structure/blocks/quiz-react-basics.json   |  2 +-
 ...react-forms-data-fetching-and-routing.json |  2 +-
 .../blocks/quiz-react-state-and-hooks.json    |  2 +-
 .../structure/blocks/quiz-recursion.json      |  2 +-
 .../blocks/quiz-responsive-web-design.json    |  2 +-
 ...quiz-searching-and-sorting-algorithms.json |  2 +-
 .../structure/blocks/quiz-semantic-html.json  |  2 +-
 .../blocks/quiz-sql-and-postgresql.json       |  2 +-
 .../structure/blocks/quiz-styling-forms.json  |  2 +-
 curriculum/structure/blocks/quiz-testing.json |  2 +-
 .../structure/blocks/quiz-typescript.json     |  2 +-
 .../blocks/quiz-web-performance.json          |  2 +-
 curriculum/structure/blocks/recipe-page.json  |  2 +-
 .../review-asynchronous-javascript.json       |  2 +-
 .../structure/blocks/review-bash-and-sql.json |  2 +-
 .../blocks/review-bash-commands.json          |  2 +-
 .../blocks/review-bash-scripting.json         |  2 +-
 .../structure/blocks/review-basic-css.json    |  2 +-
 .../structure/blocks/review-basic-html.json   |  2 +-
 .../blocks/review-classes-and-objects.json    |  2 +-
 .../blocks/review-computer-basics.json        |  2 +-
 .../blocks/review-css-accessibility.json      |  2 +-
 .../blocks/review-css-animations.json         |  2 +-
 .../review-css-attribute-selectors.json       |  2 +-
 .../review-css-backgrounds-and-borders.json   |  2 +-
 .../structure/blocks/review-css-colors.json   |  2 +-
 .../structure/blocks/review-css-flexbox.json  |  2 +-
 .../structure/blocks/review-css-grid.json     |  2 +-
 .../blocks/review-css-layout-and-effects.json |  2 +-
 .../review-css-libraries-and-frameworks.json  |  2 +-
 .../blocks/review-css-positioning.json        |  2 +-
 .../blocks/review-css-pseudo-classes.json     |  2 +-
 ...eview-css-relative-and-absolute-units.json |  2 +-
 .../blocks/review-css-typography.json         |  2 +-
 .../blocks/review-css-variables.json          |  2 +-
 curriculum/structure/blocks/review-css.json   |  2 +-
 .../blocks/review-data-structures.json        |  2 +-
 .../blocks/review-debugging-javascript.json   |  2 +-
 .../blocks/review-design-fundamentals.json    |  2 +-
 .../blocks/review-dictionaries-and-sets.json  |  2 +-
 ...tion-and-click-events-with-javascript.json |  2 +-
 .../blocks/review-dynamic-programming.json    |  2 +-
 .../blocks/review-error-handling.json         |  2 +-
 ...eview-form-validation-with-javascript.json |  2 +-
 .../blocks/review-front-end-libraries.json    |  2 +-
 curriculum/structure/blocks/review-git.json   |  2 +-
 .../blocks/review-graphs-and-trees.json       |  2 +-
 .../blocks/review-html-accessibility.json     |  2 +-
 .../blocks/review-html-tables-and-forms.json  |  2 +-
 curriculum/structure/blocks/review-html.json  |  2 +-
 .../blocks/review-javascript-arrays.json      |  2 +-
 .../review-javascript-audio-and-video.json    |  2 +-
 .../blocks/review-javascript-classes.json     |  2 +-
 ...vascript-comparisons-and-conditionals.json |  2 +-
 .../blocks/review-javascript-dates.json       |  2 +-
 ...iew-javascript-functional-programming.json |  2 +-
 .../blocks/review-javascript-functions.json   |  2 +-
 .../review-javascript-fundamentals.json       |  2 +-
 ...iew-javascript-higher-order-functions.json |  2 +-
 .../blocks/review-javascript-loops.json       |  2 +-
 .../review-javascript-maps-and-sets.json      |  2 +-
 .../blocks/review-javascript-math.json        |  2 +-
 .../blocks/review-javascript-objects.json     |  2 +-
 ...review-javascript-regular-expressions.json |  2 +-
 .../blocks/review-javascript-strings.json     |  2 +-
 ...w-javascript-variables-and-data-types.json |  2 +-
 .../structure/blocks/review-javascript.json   |  2 +-
 .../structure/blocks/review-js-a11y.json      |  2 +-
 .../blocks/review-local-storage-and-crud.json |  2 +-
 .../blocks/review-loops-and-sequences.json    |  2 +-
 .../review-object-oriented-programming.json   |  2 +-
 .../blocks/review-python-basics.json          |  2 +-
 .../structure/blocks/review-python.json       |  2 +-
 .../structure/blocks/review-react-basics.json |  2 +-
 ...react-forms-data-fetching-and-routing.json |  2 +-
 .../blocks/review-react-state-and-hooks.json  |  2 +-
 .../structure/blocks/review-recursion.json    |  2 +-
 .../blocks/review-relational-databases.json   |  2 +-
 .../blocks/review-responsive-web-design.json  |  2 +-
 ...view-searching-and-sorting-algorithms.json |  2 +-
 .../blocks/review-semantic-html.json          |  2 +-
 .../blocks/review-sql-and-postgresql.json     |  2 +-
 .../blocks/review-styling-forms.json          |  2 +-
 .../structure/blocks/review-testing.json      |  2 +-
 .../structure/blocks/review-typescript.json   |  2 +-
 .../blocks/review-web-performance.json        |  2 +-
 .../blocks/workshop-accessibility-quiz.json   |  2 +-
 .../blocks/workshop-balance-sheet.json        |  2 +-
 .../blocks/workshop-bash-boilerplate.json     |  2 +-
 .../blocks/workshop-bash-five-programs.json   |  2 +-
 .../blocks/workshop-bike-rental-shop.json     |  2 +-
 .../blocks/workshop-binary-search.json        |  2 +-
 .../structure/blocks/workshop-blog-page.json  |  2 +-
 .../blocks/workshop-breadth-first-search.json |  2 +-
 .../blocks/workshop-build-a-heart-icon.json   |  2 +-
 ...op-build-a-video-display-using-iframe.json |  2 +-
 .../blocks/workshop-caesar-cipher.json        |  2 +-
 .../structure/blocks/workshop-cafe-menu.json  |  2 +-
 .../structure/blocks/workshop-calculator.json |  2 +-
 .../blocks/workshop-calorie-counter.json      |  2 +-
 .../structure/blocks/workshop-castle.json     |  2 +-
 .../blocks/workshop-cat-painting.json         |  2 +-
 .../blocks/workshop-cat-photo-app.json        |  2 +-
 .../blocks/workshop-city-skyline.json         |  2 +-
 .../blocks/workshop-colored-markers.json      |  2 +-
 .../blocks/workshop-curriculum-outline.json   |  2 +-
 ...hop-database-of-video-game-characters.json |  2 +-
 ...rkshop-debug-coding-journey-blog-page.json |  2 +-
 .../workshop-decimal-to-binary-converter.json |  2 +-
 .../blocks/workshop-email-simulator.json      |  2 +-
 .../blocks/workshop-emoji-reactor.json        |  2 +-
 .../workshop-error-message-component.json     |  2 +-
 .../blocks/workshop-fcc-authors-page.json     |  2 +-
 .../blocks/workshop-ferris-wheel.json         |  2 +-
 .../blocks/workshop-final-exams-table.json    |  2 +-
 .../blocks/workshop-flappy-penguin.json       |  2 +-
 .../workshop-flexbox-photo-gallery.json       |  2 +-
 .../blocks/workshop-fruit-search-app.json     |  2 +-
 .../blocks/workshop-greeting-bot.json         |  2 +-
 .../blocks/workshop-greeting-card.json        |  2 +-
 .../blocks/workshop-hotel-feedback-form.json  |  2 +-
 .../workshop-kitty-ipsum-translator.json      |  2 +-
 .../blocks/workshop-library-manager.json      |  2 +-
 .../blocks/workshop-linked-list-class.json    |  2 +-
 .../workshop-loan-qualification-checker.json  |  2 +-
 .../structure/blocks/workshop-magazine.json   |  2 +-
 .../structure/blocks/workshop-mathbot.json    |  2 +-
 .../blocks/workshop-media-catalogue.json      |  2 +-
 .../workshop-medical-data-validator.json      |  2 +-
 .../structure/blocks/workshop-merge-sort.json |  2 +-
 .../workshop-music-instrument-filter.json     |  2 +-
 .../blocks/workshop-music-player.json         |  2 +-
 ...workshop-musical-instrument-inventory.json |  2 +-
 .../blocks/workshop-note-taking-app.json      |  2 +-
 .../blocks/workshop-nutritional-label.json    |  2 +-
 .../structure/blocks/workshop-piano.json      |  2 +-
 .../blocks/workshop-pin-extractor.json        |  2 +-
 .../blocks/workshop-planets-tablist.json      |  2 +-
 .../workshop-plant-nursery-catalog.json       |  2 +-
 .../workshop-recipe-ingredient-converter.json |  2 +-
 .../blocks/workshop-recipe-tracker.json       |  2 +-
 .../blocks/workshop-registration-form.json    |  2 +-
 .../blocks/workshop-reusable-mega-navbar.json |  2 +-
 ...kshop-reusable-profile-card-component.json |  2 +-
 .../blocks/workshop-rothko-painting.json      |  2 +-
 .../structure/blocks/workshop-rps-game.json   |  2 +-
 .../blocks/workshop-salary-tracker.json       |  2 +-
 .../blocks/workshop-sentence-analyzer.json    |  2 +-
 .../blocks/workshop-shopping-cart.json        |  2 +-
 .../blocks/workshop-shopping-list-app.json    |  2 +-
 .../blocks/workshop-shopping-list.json        |  2 +-
 .../blocks/workshop-spam-filter.json          |  2 +-
 .../blocks/workshop-sql-reference-object.json |  2 +-
 .../workshop-sql-student-database-part-1.json |  2 +-
 .../workshop-sql-student-database-part-2.json |  2 +-
 .../blocks/workshop-storytelling-app.json     |  2 +-
 .../blocks/workshop-string-transformer.json   |  2 +-
 .../workshop-superhero-application-form.json  |  2 +-
 .../workshop-tailwind-cta-component.json      |  2 +-
 .../workshop-tailwind-pricing-component.json  |  2 +-
 .../blocks/workshop-teacher-chatbot.json      |  2 +-
 .../workshop-tech-conference-schedule.json    |  2 +-
 .../structure/blocks/workshop-todo-app.json   |  2 +-
 .../blocks/workshop-toggle-text-app.json      |  2 +-
 shared/config/blocks.ts                       |  2 +-
 .../create-language-block.ts                  | 34 ++++++++---------
 .../create-project.ts                         | 38 ++++++++++---------
 .../helpers/get-base-meta.ts                  |  6 +--
 .../helpers/project-metadata.ts               |  2 +-
 .../build/build-external-curricula-data-v1.ts | 12 ++++--
 .../build/build-external-curricula-data-v2.ts |  7 +++-
 tools/scripts/build/patches.ts                |  7 ++++
 530 files changed, 612 insertions(+), 603 deletions(-)
 create mode 100644 tools/scripts/build/patches.ts

diff --git a/client/gatsby-node.js b/client/gatsby-node.js
index 0684311aa28..2923d8b7e55 100644
--- a/client/gatsby-node.js
+++ b/client/gatsby-node.js
@@ -73,7 +73,7 @@ exports.createPages = async function createPages({
             id
             challenge {
               block
-              blockType
+              blockLabel
               blockLayout
               certification
               challengeType
@@ -310,7 +310,7 @@ exports.createSchemaCustomization = ({ actions }) => {
       block: String
       blockId: String
       blockLayout: String
-      blockType: String
+      blockLabel: String
       certification: String
       challengeFiles: [FileContents]
       challengeOrder: Int
diff --git a/client/src/redux/prop-types.ts b/client/src/redux/prop-types.ts
index 1ec1a8ed6d5..e14270a4650 100644
--- a/client/src/redux/prop-types.ts
+++ b/client/src/redux/prop-types.ts
@@ -1,7 +1,7 @@
 import { HandlerProps } from 'react-reflex';
 import { SuperBlocks } from '../../../shared-dist/config/curriculum';
 import type { Chapter } from '../../../shared-dist/config/chapters';
-import { BlockLayouts, BlockTypes } from '../../../shared-dist/config/blocks';
+import { BlockLayouts, BlockLabel } from '../../../shared-dist/config/blocks';
 import type { ChallengeFile, Ext } from '../../../shared-dist/utils/polyvinyl';
 import { type CertTitle } from '../../config/cert-and-project-map';
 import { UserThemes } from './types';
@@ -188,7 +188,7 @@ type InteractiveEditorNodule = {
 export type ChallengeNode = {
   challenge: {
     block: string;
-    blockType: BlockTypes;
+    blockLabel: BlockLabel;
     blockLayout: BlockLayouts;
     certification: string;
     challengeOrder: number;
@@ -514,7 +514,6 @@ export type ChallengeMeta = {
   superBlock: SuperBlocks | 'daily-coding-challenge';
   title?: string;
   challengeType?: number;
-  blockType?: BlockTypes;
   helpCategory: string;
   disableLoopProtectTests: boolean;
   disableLoopProtectPreview: boolean;
diff --git a/client/src/templates/Challenges/generic/show.tsx b/client/src/templates/Challenges/generic/show.tsx
index ecb7d028c47..55f7bfac426 100644
--- a/client/src/templates/Challenges/generic/show.tsx
+++ b/client/src/templates/Challenges/generic/show.tsx
@@ -28,7 +28,6 @@ import {
   initTests
 } from '../redux/actions';
 import { isChallengeCompletedSelector } from '../redux/selectors';
-import { BlockTypes } from '../../../../../shared-dist/config/blocks';
 import { getChallengePaths } from '../utils/challenge-paths';
 import Scene from '../components/scene/scene';
 import MultipleChoiceQuestions from '../components/multiple-choice-questions';
@@ -90,7 +89,6 @@ const ShowGeneric = ({
         assignments,
         bilibiliIds,
         block,
-        blockType,
         description,
         nodules,
         explanation,
@@ -133,7 +131,6 @@ const ShowGeneric = ({
       title,
       challengeType,
       helpCategory,
-      blockType,
       ...challengePaths
     });
     challengeMounted(challengeMeta.id);
@@ -310,7 +307,7 @@ const ShowGeneric = ({
               )}
 
               <Button block={true} variant='primary' onClick={handleSubmit}>
-                {blockType === BlockTypes.review
+                {questions.length == 0
                   ? t('buttons.submit')
                   : t('buttons.check-answer')}
               </Button>
@@ -349,7 +346,6 @@ export const query = graphql`
           cid
         }
         block
-        blockType
         challengeType
         description
         nodules {
diff --git a/client/src/templates/Challenges/redux/completion-epic.js b/client/src/templates/Challenges/redux/completion-epic.js
index 221e2906e9e..4c2a38a935a 100644
--- a/client/src/templates/Challenges/redux/completion-epic.js
+++ b/client/src/templates/Challenges/redux/completion-epic.js
@@ -258,7 +258,6 @@ export default function completionEpic(action$, state$) {
         nextChallengePath,
         challengeType,
         superBlock,
-        blockType,
         block,
         module,
         blockHashSlug
@@ -296,7 +295,7 @@ export default function completionEpic(action$, state$) {
 
         const donationData =
           chapterBasedSuperBlocks.includes(superBlock) &&
-          blockType !== 'review' &&
+          challengeType !== challengeTypes.review &&
           isModuleNewlyCompletedSelector(state)
             ? { module, superBlock }
             : !chapterBasedSuperBlocks.includes(superBlock) &&
diff --git a/client/src/templates/Challenges/redux/index.js b/client/src/templates/Challenges/redux/index.js
index d3784bc1864..6bb6b2fe392 100644
--- a/client/src/templates/Challenges/redux/index.js
+++ b/client/src/templates/Challenges/redux/index.js
@@ -21,7 +21,6 @@ const initialState = {
     superBlock: '',
     block: '',
     blockHashSlug: '/',
-    blockType: '',
     id: '',
     isLastChallengeInBlock: false,
     nextChallengePath: '/',
diff --git a/client/src/templates/Introduction/components/block-header.tsx b/client/src/templates/Introduction/components/block-header.tsx
index b2869b2d018..33376be6bb2 100644
--- a/client/src/templates/Introduction/components/block-header.tsx
+++ b/client/src/templates/Introduction/components/block-header.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { isEmpty } from 'lodash';
 
-import { BlockTypes } from '../../../../../shared-dist/config/blocks';
+import type { BlockLabel as BlockLabelType } from '../../../../../shared-dist/config/blocks';
 import { ProgressBar } from '../../../components/Progress/progress-bar';
 import DropDown from '../../../assets/icons/dropdown';
 import CheckMark from './check-mark';
@@ -11,7 +11,7 @@ import BlockIntros from './block-intros';
 interface BlockHeaderProps {
   blockDashed: string;
   blockTitle: string;
-  blockType: BlockTypes | null;
+  blockLabel: BlockLabelType | null;
   courseCompletionStatus: string;
   completedCount: number;
   handleClick: () => void;
@@ -24,7 +24,7 @@ interface BlockHeaderProps {
 function BlockHeader({
   blockDashed,
   blockTitle,
-  blockType,
+  blockLabel,
   completedCount,
   courseCompletionStatus,
   handleClick,
@@ -44,7 +44,7 @@ function BlockHeader({
         >
           <span className='block-header-button-text map-title'>
             <CheckMark isCompleted={isCompleted} />
-            {blockType && <BlockLabel blockType={blockType} />}
+            {blockLabel && <BlockLabel blockLabel={blockLabel} />}
             <span>
               {blockTitle}
               <span className='sr-only'>, {courseCompletionStatus}</span>
diff --git a/client/src/templates/Introduction/components/block-label.tsx b/client/src/templates/Introduction/components/block-label.tsx
index 32502fcf744..045b1323143 100644
--- a/client/src/templates/Introduction/components/block-label.tsx
+++ b/client/src/templates/Introduction/components/block-label.tsx
@@ -1,17 +1,17 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { BlockTypes } from '../../../../../shared-dist/config/blocks';
+import { BlockLabel as BlockLabelType } from '../../../../../shared-dist/config/blocks';
 
 interface BlockLabelProps {
-  blockType: BlockTypes;
+  blockLabel: BlockLabelType;
 }
 
-function BlockLabel({ blockType }: BlockLabelProps): JSX.Element {
+function BlockLabel({ blockLabel }: BlockLabelProps): JSX.Element {
   const { t } = useTranslation();
 
   return (
-    <div className={`block-label block-label-${blockType}`}>
-      {t(`learn.block-type.${blockType}`)}
+    <div className={`block-label block-label-${blockLabel}`}>
+      {t(`learn.block-type.${blockLabel}`)}
     </div>
   );
 }
diff --git a/client/src/templates/Introduction/components/block.test.tsx b/client/src/templates/Introduction/components/block.test.tsx
index ca61d9ec9aa..469e39eda59 100644
--- a/client/src/templates/Introduction/components/block.test.tsx
+++ b/client/src/templates/Introduction/components/block.test.tsx
@@ -15,7 +15,7 @@ import {
 import { isAuditedSuperBlock } from '../../../../../shared-dist/utils/is-audited';
 import {
   BlockLayouts,
-  BlockTypes
+  BlockLabel
 } from '../../../../../shared-dist/config/blocks';
 import { Block } from './block';
 
@@ -27,11 +27,11 @@ vi.mock('../../../utils/get-words');
 
 const defaultProps = {
   block: 'test-block',
-  blockType: null,
+  blockLabel: null,
   challenges: [
     {
       block: 'testblock',
-      blockType: BlockTypes.lab,
+      blockLabel: BlockLabel.lab,
       blockLayout: BlockLayouts.ChallengeGrid,
       certification: 'mockCertification',
       challengeOrder: 1,
diff --git a/client/src/templates/Introduction/components/block.tsx b/client/src/templates/Introduction/components/block.tsx
index 1492ba8f53a..73498da4bbf 100644
--- a/client/src/templates/Introduction/components/block.tsx
+++ b/client/src/templates/Introduction/components/block.tsx
@@ -22,7 +22,7 @@ import { makeExpandedBlockSelector, toggleBlock } from '../redux';
 import { isProjectBased } from '../../../utils/curriculum-layout';
 import {
   BlockLayouts,
-  BlockTypes
+  BlockLabel as BlockLabelType
 } from '../../../../../shared-dist/config/blocks';
 import CheckMark from './check-mark';
 import {
@@ -67,7 +67,7 @@ interface ChallengeInfo {
 
 interface BlockProps {
   block: string;
-  blockType: BlockTypes | null;
+  blockLabel: BlockLabelType | null;
   challenges: ChallengeInfo[];
   completedChallengeIds: string[];
   isExpanded: boolean;
@@ -108,7 +108,7 @@ export class Block extends Component<BlockProps> {
   render(): ReactNode {
     const {
       block,
-      blockType,
+      blockLabel,
       completedChallengeIds,
       challenges,
       isExpanded,
@@ -187,7 +187,7 @@ export class Block extends Component<BlockProps> {
         >
           <div className='block-header'>
             <h3 className='big-block-title'>{blockTitle}</h3>
-            {blockType && <BlockLabel blockType={blockType} />}
+            {blockLabel && <BlockLabel blockLabel={blockLabel} />}
             {!isAudited && (
               <div className='block-cta-wrapper'>
                 <Link
@@ -243,7 +243,7 @@ export class Block extends Component<BlockProps> {
         >
           <div className='block-header'>
             <h3 className='big-block-title'>{blockTitle}</h3>
-            {blockType && <BlockLabel blockType={blockType} />}
+            {blockLabel && <BlockLabel blockLabel={blockLabel} />}
             {!isAudited && (
               <div className='block-cta-wrapper'>
                 <Link
@@ -276,7 +276,7 @@ export class Block extends Component<BlockProps> {
           <BlockHeader
             blockDashed={block}
             blockTitle={blockTitle}
-            blockType={blockType}
+            blockLabel={blockLabel}
             completedCount={completedCount}
             courseCompletionStatus={courseCompletionStatus()}
             handleClick={this.handleBlockClick}
@@ -323,7 +323,7 @@ export class Block extends Component<BlockProps> {
           <BlockHeader
             blockDashed={block}
             blockTitle={blockTitle}
-            blockType={blockType}
+            blockLabel={blockLabel}
             completedCount={completedCount}
             courseCompletionStatus={courseCompletionStatus()}
             handleClick={this.handleBlockClick}
@@ -387,7 +387,7 @@ export class Block extends Component<BlockProps> {
             )}
           </div>
           <div className='title-wrapper map-title'>
-            {blockType && <BlockLabel blockType={blockType} />}
+            {blockLabel && <BlockLabel blockLabel={blockLabel} />}
             <h3 className='block-grid-title'>
               <Link
                 className='block-header'
@@ -427,7 +427,7 @@ export class Block extends Component<BlockProps> {
           <BlockHeader
             blockDashed={block}
             blockTitle={blockTitle}
-            blockType={blockType}
+            blockLabel={blockLabel}
             completedCount={completedCount}
             courseCompletionStatus={courseCompletionStatus()}
             handleClick={this.handleBlockClick}
diff --git a/client/src/templates/Introduction/components/super-block-accordion.tsx b/client/src/templates/Introduction/components/super-block-accordion.tsx
index d38db25a43f..782c437a2e1 100644
--- a/client/src/templates/Introduction/components/super-block-accordion.tsx
+++ b/client/src/templates/Introduction/components/super-block-accordion.tsx
@@ -10,7 +10,7 @@ import { ChapterIcon } from '../../../assets/chapter-icon';
 import { type Chapter } from '../../../../../shared-dist/config/chapters';
 import {
   BlockLayouts,
-  BlockTypes
+  BlockLabel
 } from '../../../../../shared-dist/config/blocks';
 import { FsdChapters } from '../../../../../shared-dist/config/chapters';
 import { type Module } from '../../../../../shared-dist/config/modules';
@@ -44,7 +44,7 @@ interface ModuleProps {
 interface Challenge {
   id: string;
   block: string;
-  blockType: BlockTypes;
+  blockLabel: BlockLabel;
   title: string;
   fields: { slug: string };
   dashedName: string;
@@ -162,7 +162,7 @@ const LinkBlock = ({
     <li className='link-block'>
       <Block
         block={challenges[0].block}
-        blockType={challenges[0].blockType}
+        blockLabel={challenges[0].blockLabel}
         challenges={challenges}
         superBlock={superBlock}
       />
@@ -226,7 +226,7 @@ export const SuperBlockAccordion = ({
 
         return {
           name: block,
-          blockType: blockChallenges[0]?.blockType ?? null,
+          blockLabel: blockChallenges[0]?.blockLabel ?? null,
           challenges: blockChallenges
         };
       });
@@ -358,7 +358,7 @@ export const SuperBlockAccordion = ({
                     <li key={block.name}>
                       <Block
                         block={block.name}
-                        blockType={block.blockType}
+                        blockLabel={block.blockLabel}
                         challenges={block.challenges}
                         superBlock={superBlock}
                       />
diff --git a/client/src/templates/Introduction/super-block-intro.tsx b/client/src/templates/Introduction/super-block-intro.tsx
index 05242dfa464..8b37db53746 100644
--- a/client/src/templates/Introduction/super-block-intro.tsx
+++ b/client/src/templates/Introduction/super-block-intro.tsx
@@ -36,7 +36,7 @@ import { CertTitle, liveCerts } from '../../../config/cert-and-project-map';
 import { superBlockToCertMap } from '../../../../shared-dist/config/certification-settings';
 import {
   BlockLayouts,
-  BlockTypes
+  BlockLabel
 } from '../../../../shared-dist/config/blocks';
 import Block from './components/block';
 import CertChallenge from './components/cert-challenge';
@@ -59,7 +59,7 @@ type ChallengeNode = {
     fields: { slug: string; blockName: string };
     id: string;
     block: string;
-    blockType: BlockTypes;
+    blockLabel: BlockLabel;
     challengeType: number;
     title: string;
     order: number;
@@ -287,13 +287,13 @@ const SuperBlockIntroductionPage = (props: SuperBlockProps) => {
                     const blockChallenges = superBlockChallenges.filter(
                       c => c.block === block
                     );
-                    const blockType = blockChallenges[0].blockType;
+                    const blockLabel = blockChallenges[0].blockLabel;
 
                     return (
                       <Block
                         key={block}
                         block={block}
-                        blockType={blockType}
+                        blockLabel={blockLabel}
                         challenges={blockChallenges}
                         superBlock={superBlock}
                       />
@@ -360,7 +360,7 @@ export const query = graphql`
           }
           id
           block
-          blockType
+          blockLabel
           challengeType
           title
           order
diff --git a/curriculum/schema/challenge-schema.js b/curriculum/schema/challenge-schema.js
index 5127d1ece93..eb12c4ada1a 100644
--- a/curriculum/schema/challenge-schema.js
+++ b/curriculum/schema/challenge-schema.js
@@ -129,7 +129,7 @@ const quizJoi = Joi.object().keys({
 const schema = Joi.object().keys({
   block: Joi.string().regex(slugRE).required(),
   blockId: Joi.objectId(),
-  blockType: Joi.when('superBlock', {
+  blockLabel: Joi.when('superBlock', {
     is: [...chapterBasedSuperBlocks, ...catalogSuperBlocks],
     then: Joi.valid(
       'workshop',
diff --git a/curriculum/schema/meta-schema.js b/curriculum/schema/meta-schema.js
index 641945d790d..852062c3a34 100644
--- a/curriculum/schema/meta-schema.js
+++ b/curriculum/schema/meta-schema.js
@@ -15,7 +15,7 @@ const schema = Joi.object()
       'legacy-link',
       'legacy-challenge-grid'
     ).required(),
-    blockType: Joi.valid(
+    blockLabel: Joi.valid(
       'workshop',
       'lab',
       'lecture',
diff --git a/curriculum/src/build-superblock.test.js b/curriculum/src/build-superblock.test.js
index 480964bdd44..9ff38f2fd50 100644
--- a/curriculum/src/build-superblock.test.js
+++ b/curriculum/src/build-superblock.test.js
@@ -70,7 +70,7 @@ const dummyUnfinishedSuperBlock = {
 const dummyBlockMeta = {
   name: 'Test Block',
   blockLayout: 'challenge-list',
-  blockType: 'workshop',
+  blockLabel: 'workshop',
   isUpcomingChange: false,
   dashedName: 'test-block',
   superBlock: 'responsive-web-design',
@@ -124,7 +124,7 @@ const expectedChallengeProperties = {
   isLastChallengeInBlock: expect.any(Boolean),
   block: dummyBlockMeta.dashedName,
   blockLayout: dummyBlockMeta.blockLayout,
-  blockType: dummyBlockMeta.blockType,
+  blockLabel: dummyBlockMeta.blockLabel,
   hasEditableBoundaries: dummyBlockMeta.hasEditableBoundaries,
   order: dummyBlockMeta.order,
   description: '',
diff --git a/curriculum/src/build-superblock.ts b/curriculum/src/build-superblock.ts
index 5421f120519..7a387accff5 100644
--- a/curriculum/src/build-superblock.ts
+++ b/curriculum/src/build-superblock.ts
@@ -156,7 +156,7 @@ export function addMetaToChallenge(
 
   // Add basic meta properties
   challenge.block = meta.dashedName;
-  challenge.blockType = meta.blockType;
+  challenge.blockLabel = meta.blockLabel;
   challenge.blockLayout = meta.blockLayout;
   challenge.hasEditableBoundaries = !!meta.hasEditableBoundaries;
   challenge.order = meta.order;
diff --git a/curriculum/src/file-handler.ts b/curriculum/src/file-handler.ts
index 084989e3dc4..dff790112ab 100644
--- a/curriculum/src/file-handler.ts
+++ b/curriculum/src/file-handler.ts
@@ -132,7 +132,7 @@ export type Challenge = {
   instructions?: string;
   questions?: string[];
   block?: string;
-  blockType?: string;
+  blockLabel?: string;
   blockLayout?: string;
   hasEditableBoundaries?: boolean;
   order?: number;
@@ -165,7 +165,7 @@ export interface BlockStructure {
   disableLoopProtectTests?: boolean;
   disableLoopProtectPreview?: boolean;
   blockLayout: string;
-  blockType: string;
+  blockLabel: string;
   challengeOrder: Challenge[];
   dashedName: string;
   isUpcomingChange?: boolean;
diff --git a/curriculum/structure/blocks/cat-blog-page.json b/curriculum/structure/blocks/cat-blog-page.json
index f40eb76d868..afb71c1be8a 100644
--- a/curriculum/structure/blocks/cat-blog-page.json
+++ b/curriculum/structure/blocks/cat-blog-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Cat Blog Page",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": true,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/cat-photo-app.json b/curriculum/structure/blocks/cat-photo-app.json
index 08e1c2083ea..795c898f6e6 100644
--- a/curriculum/structure/blocks/cat-photo-app.json
+++ b/curriculum/structure/blocks/cat-photo-app.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Cat Photo App",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": true,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/es-a1-learn-alphabet-and-accents.json b/curriculum/structure/blocks/es-a1-learn-alphabet-and-accents.json
index 3b3f84e1592..f6a81d537b6 100644
--- a/curriculum/structure/blocks/es-a1-learn-alphabet-and-accents.json
+++ b/curriculum/structure/blocks/es-a1-learn-alphabet-and-accents.json
@@ -7,5 +7,5 @@
   "challengeOrder": [
     { "id": "68d2a85831f330ab9c100e87", "title": "Dialogue 1: I'm Tom" }
   ],
-  "blockType": "learn"
+  "blockLabel": "learn"
 }
diff --git a/curriculum/structure/blocks/es-a1-learn-certification-introduction.json b/curriculum/structure/blocks/es-a1-learn-certification-introduction.json
index 1daec130b7c..2bb5a8f0411 100644
--- a/curriculum/structure/blocks/es-a1-learn-certification-introduction.json
+++ b/curriculum/structure/blocks/es-a1-learn-certification-introduction.json
@@ -19,5 +19,5 @@
       "title": "How to Set Up the Spanish Keyboard on Mobile"
     }
   ],
-  "blockType": "learn"
+  "blockLabel": "learn"
 }
diff --git a/curriculum/structure/blocks/es-a1-learn-greetings-during-the-day.json b/curriculum/structure/blocks/es-a1-learn-greetings-during-the-day.json
index 29c9a846284..2bf97b13c48 100644
--- a/curriculum/structure/blocks/es-a1-learn-greetings-during-the-day.json
+++ b/curriculum/structure/blocks/es-a1-learn-greetings-during-the-day.json
@@ -4,7 +4,7 @@
   "dashedName": "es-a1-learn-greetings-during-the-day",
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
-  "blockType": "learn",
+  "blockLabel": "learn",
   "challengeOrder": [
     { "id": "68c488abd71a3e27190965e0", "title": "Task 1" },
     { "id": "68c84d44d91406c37b3ad73f", "title": "Task 2" },
diff --git a/curriculum/structure/blocks/es-a1-learn-meet-angela-and-basti.json b/curriculum/structure/blocks/es-a1-learn-meet-angela-and-basti.json
index 5566fc9578e..5403b16fbae 100644
--- a/curriculum/structure/blocks/es-a1-learn-meet-angela-and-basti.json
+++ b/curriculum/structure/blocks/es-a1-learn-meet-angela-and-basti.json
@@ -5,5 +5,5 @@
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
   "challengeOrder": [{ "id": "68dc7593a29e5c7621d873ee", "title": "Task 1" }],
-  "blockType": "learn"
+  "blockLabel": "learn"
 }
diff --git a/curriculum/structure/blocks/es-a1-learn-meet-julieta.json b/curriculum/structure/blocks/es-a1-learn-meet-julieta.json
index 206ad33fe67..3da55190d00 100644
--- a/curriculum/structure/blocks/es-a1-learn-meet-julieta.json
+++ b/curriculum/structure/blocks/es-a1-learn-meet-julieta.json
@@ -5,5 +5,5 @@
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
   "challengeOrder": [{ "id": "68dc74dc55e05b6ee15b743d", "title": "Task 1" }],
-  "blockType": "learn"
+  "blockLabel": "learn"
 }
diff --git a/curriculum/structure/blocks/es-a1-learn-meet-luna.json b/curriculum/structure/blocks/es-a1-learn-meet-luna.json
index 667fef38824..2415aac3dcc 100644
--- a/curriculum/structure/blocks/es-a1-learn-meet-luna.json
+++ b/curriculum/structure/blocks/es-a1-learn-meet-luna.json
@@ -5,5 +5,5 @@
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
   "challengeOrder": [{ "id": "68dc747c75837c6bb82aeeb8", "title": "Task 1" }],
-  "blockType": "learn"
+  "blockLabel": "learn"
 }
diff --git a/curriculum/structure/blocks/es-a1-learn-meet-mateo.json b/curriculum/structure/blocks/es-a1-learn-meet-mateo.json
index c7b79cf4b4e..09e532a748a 100644
--- a/curriculum/structure/blocks/es-a1-learn-meet-mateo.json
+++ b/curriculum/structure/blocks/es-a1-learn-meet-mateo.json
@@ -5,5 +5,5 @@
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
   "challengeOrder": [{ "id": "68dc74a6f1c8c46cfd4af3f4", "title": "Task 1" }],
-  "blockType": "learn"
+  "blockLabel": "learn"
 }
diff --git a/curriculum/structure/blocks/es-a1-learn-punctuation.json b/curriculum/structure/blocks/es-a1-learn-punctuation.json
index 4945a5cec47..d630210de87 100644
--- a/curriculum/structure/blocks/es-a1-learn-punctuation.json
+++ b/curriculum/structure/blocks/es-a1-learn-punctuation.json
@@ -7,5 +7,5 @@
   "challengeOrder": [
     { "id": "68d2a874b217f0aedcf331d5", "title": "Dialogue 1: I'm Tom" }
   ],
-  "blockType": "learn"
+  "blockLabel": "learn"
 }
diff --git a/curriculum/structure/blocks/es-a1-practice-first-questions.json b/curriculum/structure/blocks/es-a1-practice-first-questions.json
index 5fce2314bad..3e3fe1c2058 100644
--- a/curriculum/structure/blocks/es-a1-practice-first-questions.json
+++ b/curriculum/structure/blocks/es-a1-practice-first-questions.json
@@ -5,5 +5,5 @@
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
   "challengeOrder": [{ "id": "68dc75b0fe65b57754913412", "title": "Task 1" }],
-  "blockType": "practice"
+  "blockLabel": "practice"
 }
diff --git a/curriculum/structure/blocks/es-a1-practice-greetings-and-farewells.json b/curriculum/structure/blocks/es-a1-practice-greetings-and-farewells.json
index ce26404e2b5..3a0a3b6ea7a 100644
--- a/curriculum/structure/blocks/es-a1-practice-greetings-and-farewells.json
+++ b/curriculum/structure/blocks/es-a1-practice-greetings-and-farewells.json
@@ -4,7 +4,7 @@
   "dashedName": "es-a1-practice-greetings-and-farewells",
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
-  "blockType": "practice",
+  "blockLabel": "practice",
   "challengeOrder": [
     { "id": "68c850c5eb642cc96ed86544", "title": "Task 1" },
     { "id": "68de9f4c14f4d1335059da98", "title": "Task 2" },
diff --git a/curriculum/structure/blocks/es-a1-practice-introducing-yourself.json b/curriculum/structure/blocks/es-a1-practice-introducing-yourself.json
index c84f3cda949..66a73ccc0ae 100644
--- a/curriculum/structure/blocks/es-a1-practice-introducing-yourself.json
+++ b/curriculum/structure/blocks/es-a1-practice-introducing-yourself.json
@@ -5,5 +5,5 @@
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
   "challengeOrder": [{ "id": "68dc7500da504f7042474b20", "title": "Task 1" }],
-  "blockType": "practice"
+  "blockLabel": "practice"
 }
diff --git a/curriculum/structure/blocks/es-a1-quiz-alphabet-accent-and-punctuation-quiz.json b/curriculum/structure/blocks/es-a1-quiz-alphabet-accent-and-punctuation-quiz.json
index e7425fe8528..8b76d0647a3 100644
--- a/curriculum/structure/blocks/es-a1-quiz-alphabet-accent-and-punctuation-quiz.json
+++ b/curriculum/structure/blocks/es-a1-quiz-alphabet-accent-and-punctuation-quiz.json
@@ -7,5 +7,5 @@
   "challengeOrder": [
     { "id": "68d2a8fa725f6db0b7215411", "title": "Dialogue 1: I'm Tom" }
   ],
-  "blockType": "quiz"
+  "blockLabel": "quiz"
 }
diff --git a/curriculum/structure/blocks/es-a1-quiz-first-questions.json b/curriculum/structure/blocks/es-a1-quiz-first-questions.json
index a890d4e993e..961b4657387 100644
--- a/curriculum/structure/blocks/es-a1-quiz-first-questions.json
+++ b/curriculum/structure/blocks/es-a1-quiz-first-questions.json
@@ -7,5 +7,5 @@
   "challengeOrder": [
     { "id": "68dc75ee867ccc79d18df2ef", "title": "First Questions Quiz" }
   ],
-  "blockType": "quiz"
+  "blockLabel": "quiz"
 }
diff --git a/curriculum/structure/blocks/es-a1-quiz-greetings-and-farewells.json b/curriculum/structure/blocks/es-a1-quiz-greetings-and-farewells.json
index 7ad777f26a1..a8635d53d74 100644
--- a/curriculum/structure/blocks/es-a1-quiz-greetings-and-farewells.json
+++ b/curriculum/structure/blocks/es-a1-quiz-greetings-and-farewells.json
@@ -4,7 +4,7 @@
   "dashedName": "es-a1-quiz-greetings-and-farewells",
   "helpCategory": "English",
   "blockLayout": "link",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "challengeOrder": [
     {
       "id": "68c8510f4a9c00ca2a67160c",
diff --git a/curriculum/structure/blocks/es-a1-quiz-introducing-yourself.json b/curriculum/structure/blocks/es-a1-quiz-introducing-yourself.json
index 6c21436b794..20cc29ce2bc 100644
--- a/curriculum/structure/blocks/es-a1-quiz-introducing-yourself.json
+++ b/curriculum/structure/blocks/es-a1-quiz-introducing-yourself.json
@@ -7,5 +7,5 @@
   "challengeOrder": [
     { "id": "68dc7558bca0aa734dba9c05", "title": "Introducing Yourself Quiz" }
   ],
-  "blockType": "quiz"
+  "blockLabel": "quiz"
 }
diff --git a/curriculum/structure/blocks/es-a1-review-first-questions.json b/curriculum/structure/blocks/es-a1-review-first-questions.json
index 9144a3e437d..a5e81536f88 100644
--- a/curriculum/structure/blocks/es-a1-review-first-questions.json
+++ b/curriculum/structure/blocks/es-a1-review-first-questions.json
@@ -5,5 +5,5 @@
   "helpCategory": "English",
   "blockLayout": "link",
   "challengeOrder": [{ "id": "68dc75d172549d787975d2fc", "title": "Task 1" }],
-  "blockType": "review"
+  "blockLabel": "review"
 }
diff --git a/curriculum/structure/blocks/es-a1-review-greetings-and-farewells.json b/curriculum/structure/blocks/es-a1-review-greetings-and-farewells.json
index 7335b0ecb1d..ef610bfe03a 100644
--- a/curriculum/structure/blocks/es-a1-review-greetings-and-farewells.json
+++ b/curriculum/structure/blocks/es-a1-review-greetings-and-farewells.json
@@ -4,7 +4,7 @@
   "dashedName": "es-a1-review-greetings-and-farewells",
   "helpCategory": "English",
   "blockLayout": "link",
-  "blockType": "review",
+  "blockLabel": "review",
   "challengeOrder": [
     { "id": "68c850ed23d494c9be5cb22a", "title": "Grammar Highlights" },
     { "id": "68c994e8517cd6bde390e923", "title": "Glossary" }
diff --git a/curriculum/structure/blocks/es-a1-review-introducing-yourself.json b/curriculum/structure/blocks/es-a1-review-introducing-yourself.json
index 09a6c940caf..d84cef8180b 100644
--- a/curriculum/structure/blocks/es-a1-review-introducing-yourself.json
+++ b/curriculum/structure/blocks/es-a1-review-introducing-yourself.json
@@ -7,5 +7,5 @@
   "challengeOrder": [
     { "id": "68dc753010b6b271ac564e93", "title": "Dialogue 1: I'm Tom" }
   ],
-  "blockType": "review"
+  "blockLabel": "review"
 }
diff --git a/curriculum/structure/blocks/es-a1-warm-up-first-questions-basics.json b/curriculum/structure/blocks/es-a1-warm-up-first-questions-basics.json
index d80d8d12db3..e77e11c4e38 100644
--- a/curriculum/structure/blocks/es-a1-warm-up-first-questions-basics.json
+++ b/curriculum/structure/blocks/es-a1-warm-up-first-questions-basics.json
@@ -5,5 +5,5 @@
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
   "challengeOrder": [{ "id": "68dc7578ad62ca74e21c23e0", "title": "Task 1" }],
-  "blockType": "warm-up"
+  "blockLabel": "warm-up"
 }
diff --git a/curriculum/structure/blocks/es-a1-warm-up-greetings-and-farewells-basics.json b/curriculum/structure/blocks/es-a1-warm-up-greetings-and-farewells-basics.json
index c70601e6aa7..b791b5e6542 100644
--- a/curriculum/structure/blocks/es-a1-warm-up-greetings-and-farewells-basics.json
+++ b/curriculum/structure/blocks/es-a1-warm-up-greetings-and-farewells-basics.json
@@ -2,7 +2,7 @@
   "name": "Greetings and Farewells Basics",
   "dashedName": "es-a1-warm-up-greetings-and-farewells-basics",
   "isUpcomingChange": true,
-  "blockType": "warm-up",
+  "blockLabel": "warm-up",
   "blockLayout": "challenge-grid",
   "helpCategory": "English",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/es-a1-warm-up-introducing-yourself-basics.json b/curriculum/structure/blocks/es-a1-warm-up-introducing-yourself-basics.json
index 1192ab4b222..b913b9a88af 100644
--- a/curriculum/structure/blocks/es-a1-warm-up-introducing-yourself-basics.json
+++ b/curriculum/structure/blocks/es-a1-warm-up-introducing-yourself-basics.json
@@ -5,5 +5,5 @@
   "helpCategory": "English",
   "blockLayout": "challenge-grid",
   "challengeOrder": [{ "id": "68dc7452147bb2678bccc29a", "title": "Task 1" }],
-  "blockType": "warm-up"
+  "blockLabel": "warm-up"
 }
diff --git a/curriculum/structure/blocks/event-hub.json b/curriculum/structure/blocks/event-hub.json
index 9addcec4cc9..a6e71ee340f 100644
--- a/curriculum/structure/blocks/event-hub.json
+++ b/curriculum/structure/blocks/event-hub.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an Event Hub",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/exam-back-end-development-and-apis-certification.json b/curriculum/structure/blocks/exam-back-end-development-and-apis-certification.json
index d8cffa54804..56bfe7660de 100644
--- a/curriculum/structure/blocks/exam-back-end-development-and-apis-certification.json
+++ b/curriculum/structure/blocks/exam-back-end-development-and-apis-certification.json
@@ -1,6 +1,6 @@
 {
   "name": "Back End Development and APIs Certification Exam",
-  "blockType": "exam",
+  "blockLabel": "exam",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "exam-back-end-development-and-apis-certification",
diff --git a/curriculum/structure/blocks/exam-certified-full-stack-developer.json b/curriculum/structure/blocks/exam-certified-full-stack-developer.json
index 4267bbd3026..b640cf46a77 100644
--- a/curriculum/structure/blocks/exam-certified-full-stack-developer.json
+++ b/curriculum/structure/blocks/exam-certified-full-stack-developer.json
@@ -1,6 +1,6 @@
 {
   "name": "Certified Full Stack Developer Exam",
-  "blockType": "exam",
+  "blockLabel": "exam",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "exam-certified-full-stack-developer",
diff --git a/curriculum/structure/blocks/exam-front-end-development-libraries-certification.json b/curriculum/structure/blocks/exam-front-end-development-libraries-certification.json
index e907e7af02b..84bc66234cb 100644
--- a/curriculum/structure/blocks/exam-front-end-development-libraries-certification.json
+++ b/curriculum/structure/blocks/exam-front-end-development-libraries-certification.json
@@ -1,6 +1,6 @@
 {
   "name": "Front End Development Libraries Certification Exam",
-  "blockType": "exam",
+  "blockLabel": "exam",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "exam-front-end-development-libraries-certification",
diff --git a/curriculum/structure/blocks/exam-javascript-certification.json b/curriculum/structure/blocks/exam-javascript-certification.json
index 39c7a4115bd..3d62425b28d 100644
--- a/curriculum/structure/blocks/exam-javascript-certification.json
+++ b/curriculum/structure/blocks/exam-javascript-certification.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": true,
   "dashedName": "exam-javascript-certification",
   "helpCategory": "JavaScript",
-  "blockType": "exam",
+  "blockLabel": "exam",
   "blockLayout": "link",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/exam-python-certification.json b/curriculum/structure/blocks/exam-python-certification.json
index ae039dd046a..984732c0125 100644
--- a/curriculum/structure/blocks/exam-python-certification.json
+++ b/curriculum/structure/blocks/exam-python-certification.json
@@ -1,6 +1,6 @@
 {
   "name": "Python Certification Exam",
-  "blockType": "exam",
+  "blockLabel": "exam",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "exam-python-certification",
diff --git a/curriculum/structure/blocks/exam-relational-databases-certification.json b/curriculum/structure/blocks/exam-relational-databases-certification.json
index 67b3b9801f6..1dfd6128230 100644
--- a/curriculum/structure/blocks/exam-relational-databases-certification.json
+++ b/curriculum/structure/blocks/exam-relational-databases-certification.json
@@ -1,6 +1,6 @@
 {
   "name": "Relational Databases Certification Exam",
-  "blockType": "exam",
+  "blockLabel": "exam",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "exam-relational-databases-certification",
diff --git a/curriculum/structure/blocks/exam-responsive-web-design-certification.json b/curriculum/structure/blocks/exam-responsive-web-design-certification.json
index fec816a521d..ad179f7f7b7 100644
--- a/curriculum/structure/blocks/exam-responsive-web-design-certification.json
+++ b/curriculum/structure/blocks/exam-responsive-web-design-certification.json
@@ -10,5 +10,5 @@
       "title": "Responsive Web Design Certification Exam"
     }
   ],
-  "blockType": "exam"
+  "blockLabel": "exam"
 }
diff --git a/curriculum/structure/blocks/lab-adjacency-list-to-matrix-converter.json b/curriculum/structure/blocks/lab-adjacency-list-to-matrix-converter.json
index 421e24c6b85..36af8f4477c 100644
--- a/curriculum/structure/blocks/lab-adjacency-list-to-matrix-converter.json
+++ b/curriculum/structure/blocks/lab-adjacency-list-to-matrix-converter.json
@@ -10,5 +10,5 @@
     }
   ],
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-all-true-property-validator.json b/curriculum/structure/blocks/lab-all-true-property-validator.json
index a85d4533908..37d3eb6569f 100644
--- a/curriculum/structure/blocks/lab-all-true-property-validator.json
+++ b/curriculum/structure/blocks/lab-all-true-property-validator.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an All-True Property Validator",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-availability-table.json b/curriculum/structure/blocks/lab-availability-table.json
index 893ccaa4747..89064e00ba7 100644
--- a/curriculum/structure/blocks/lab-availability-table.json
+++ b/curriculum/structure/blocks/lab-availability-table.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an Availability Table",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-bank-account-manager.json b/curriculum/structure/blocks/lab-bank-account-manager.json
index a53582f9bde..f3828a3729d 100644
--- a/curriculum/structure/blocks/lab-bank-account-manager.json
+++ b/curriculum/structure/blocks/lab-bank-account-manager.json
@@ -10,6 +10,6 @@
     }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-bisection-method.json b/curriculum/structure/blocks/lab-bisection-method.json
index e9f978e16db..133d9b6617f 100644
--- a/curriculum/structure/blocks/lab-bisection-method.json
+++ b/curriculum/structure/blocks/lab-bisection-method.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": true,
   "dashedName": "lab-bisection-method",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "helpCategory": "Python",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lab-blog-post-card.json b/curriculum/structure/blocks/lab-blog-post-card.json
index 648a151c17e..1671aec3438 100644
--- a/curriculum/structure/blocks/lab-blog-post-card.json
+++ b/curriculum/structure/blocks/lab-blog-post-card.json
@@ -7,6 +7,6 @@
     { "id": "66eaddd04a9e533fba689001", "title": "Design a Blog Post Card" }
   ],
   "helpCategory": "HTML-CSS",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-book-catalog-table.json b/curriculum/structure/blocks/lab-book-catalog-table.json
index 09df5095cfb..d66fd3ed312 100644
--- a/curriculum/structure/blocks/lab-book-catalog-table.json
+++ b/curriculum/structure/blocks/lab-book-catalog-table.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Book Catalog Table",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-book-inventory-app.json b/curriculum/structure/blocks/lab-book-inventory-app.json
index a83cb4a2a59..36c2b6c2130 100644
--- a/curriculum/structure/blocks/lab-book-inventory-app.json
+++ b/curriculum/structure/blocks/lab-book-inventory-app.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Book Inventory App",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-book-organizer.json b/curriculum/structure/blocks/lab-book-organizer.json
index 75920f993d7..fcca56153c1 100644
--- a/curriculum/structure/blocks/lab-book-organizer.json
+++ b/curriculum/structure/blocks/lab-book-organizer.json
@@ -7,6 +7,6 @@
     { "id": "67172b43f84bcd2dec238a3d", "title": "Build a Book Organizer" }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-bookmark-manager-app.json b/curriculum/structure/blocks/lab-bookmark-manager-app.json
index 2634119391c..d39c3c327b9 100644
--- a/curriculum/structure/blocks/lab-bookmark-manager-app.json
+++ b/curriculum/structure/blocks/lab-bookmark-manager-app.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Bookmark Manager App",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-boolean-check.json b/curriculum/structure/blocks/lab-boolean-check.json
index 28d6026f1c4..c1ab70ce528 100644
--- a/curriculum/structure/blocks/lab-boolean-check.json
+++ b/curriculum/structure/blocks/lab-boolean-check.json
@@ -9,7 +9,7 @@
       "title": "Build a Boolean Check Function"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/lab-budget-app.json b/curriculum/structure/blocks/lab-budget-app.json
index c5a723dd32f..a649e4efe56 100644
--- a/curriculum/structure/blocks/lab-budget-app.json
+++ b/curriculum/structure/blocks/lab-budget-app.json
@@ -11,5 +11,5 @@
   ],
   "helpCategory": "Python",
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-business-card.json b/curriculum/structure/blocks/lab-business-card.json
index 4f4cdcc8a89..fc254b38594 100644
--- a/curriculum/structure/blocks/lab-business-card.json
+++ b/curriculum/structure/blocks/lab-business-card.json
@@ -1,6 +1,6 @@
 {
   "name": "Design a Business Card",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-celestial-bodies-database.json b/curriculum/structure/blocks/lab-celestial-bodies-database.json
index f7fd3a4d65c..9c422afd9f8 100644
--- a/curriculum/structure/blocks/lab-celestial-bodies-database.json
+++ b/curriculum/structure/blocks/lab-celestial-bodies-database.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Celestial Bodies Database",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "lab-celestial-bodies-database",
diff --git a/curriculum/structure/blocks/lab-celsius-to-fahrenheit-converter.json b/curriculum/structure/blocks/lab-celsius-to-fahrenheit-converter.json
index 4ab95019527..fed0213f909 100644
--- a/curriculum/structure/blocks/lab-celsius-to-fahrenheit-converter.json
+++ b/curriculum/structure/blocks/lab-celsius-to-fahrenheit-converter.json
@@ -10,6 +10,6 @@
     }
   ],
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-checkout-page.json b/curriculum/structure/blocks/lab-checkout-page.json
index 543e983004e..11f4e12a602 100644
--- a/curriculum/structure/blocks/lab-checkout-page.json
+++ b/curriculum/structure/blocks/lab-checkout-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Checkout Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-chunky-monkey.json b/curriculum/structure/blocks/lab-chunky-monkey.json
index 07376b41916..2c0cb42aa93 100644
--- a/curriculum/structure/blocks/lab-chunky-monkey.json
+++ b/curriculum/structure/blocks/lab-chunky-monkey.json
@@ -1,6 +1,6 @@
 {
   "name": "Implement the Chunky Monkey Algorithm",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-color-picker.json b/curriculum/structure/blocks/lab-color-picker.json
index 720295507fc..9013ad1174e 100644
--- a/curriculum/structure/blocks/lab-color-picker.json
+++ b/curriculum/structure/blocks/lab-color-picker.json
@@ -7,7 +7,7 @@
     { "id": "67bf4350777ac6ffdc027745", "title": "Build a Color Picker App" }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "disableLoopProtectPreview": true
 }
diff --git a/curriculum/structure/blocks/lab-colored-boxes.json b/curriculum/structure/blocks/lab-colored-boxes.json
index c23a74a6ba8..394639d4aa2 100644
--- a/curriculum/structure/blocks/lab-colored-boxes.json
+++ b/curriculum/structure/blocks/lab-colored-boxes.json
@@ -7,6 +7,6 @@
     { "id": "66f3f6eb66ea9dc41cdc30df", "title": "Design a Set Colored Boxes" }
   ],
   "helpCategory": "HTML-CSS",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-confidential-email-page.json b/curriculum/structure/blocks/lab-confidential-email-page.json
index 03b4df220c3..ebaa49a260c 100644
--- a/curriculum/structure/blocks/lab-confidential-email-page.json
+++ b/curriculum/structure/blocks/lab-confidential-email-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Confidential Email Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-contact-form.json b/curriculum/structure/blocks/lab-contact-form.json
index 738e240ac92..057c4abcda2 100644
--- a/curriculum/structure/blocks/lab-contact-form.json
+++ b/curriculum/structure/blocks/lab-contact-form.json
@@ -1,6 +1,6 @@
 {
   "name": "Design a Contact Form",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-counting-cards.json b/curriculum/structure/blocks/lab-counting-cards.json
index 28ba85ab57f..4bce19205a4 100644
--- a/curriculum/structure/blocks/lab-counting-cards.json
+++ b/curriculum/structure/blocks/lab-counting-cards.json
@@ -9,7 +9,7 @@
       "title": "Build a Card Counting Assistant"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/lab-currency-converter.json b/curriculum/structure/blocks/lab-currency-converter.json
index 4467d0eec29..d55242351f6 100644
--- a/curriculum/structure/blocks/lab-currency-converter.json
+++ b/curriculum/structure/blocks/lab-currency-converter.json
@@ -11,5 +11,5 @@
   "helpCategory": "JavaScript",
   "isUpcomingChange": false,
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-customer-complaint-form.json b/curriculum/structure/blocks/lab-customer-complaint-form.json
index dc434bf7490..f7fcddbb01c 100644
--- a/curriculum/structure/blocks/lab-customer-complaint-form.json
+++ b/curriculum/structure/blocks/lab-customer-complaint-form.json
@@ -2,7 +2,7 @@
   "name": "Build a Customer Complaint Form",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-customer-complaint-form",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lab-date-conversion.json b/curriculum/structure/blocks/lab-date-conversion.json
index fd3f1b033b9..48299db94f3 100644
--- a/curriculum/structure/blocks/lab-date-conversion.json
+++ b/curriculum/structure/blocks/lab-date-conversion.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Date Conversion Program",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-debug-camperbots-profile-page.json b/curriculum/structure/blocks/lab-debug-camperbots-profile-page.json
index 631cdb431a9..9b9bd4c0d52 100644
--- a/curriculum/structure/blocks/lab-debug-camperbots-profile-page.json
+++ b/curriculum/structure/blocks/lab-debug-camperbots-profile-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Debug Camperbot's Profile Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-debug-pet-adoption-page.json b/curriculum/structure/blocks/lab-debug-pet-adoption-page.json
index 09d3fc33650..143c8d7a26b 100644
--- a/curriculum/structure/blocks/lab-debug-pet-adoption-page.json
+++ b/curriculum/structure/blocks/lab-debug-pet-adoption-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Debug a Pet Adoption Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "lab-debug-pet-adoption-page",
diff --git a/curriculum/structure/blocks/lab-deep-flattening-tool.json b/curriculum/structure/blocks/lab-deep-flattening-tool.json
index 512bc0e4851..b03605c5b68 100644
--- a/curriculum/structure/blocks/lab-deep-flattening-tool.json
+++ b/curriculum/structure/blocks/lab-deep-flattening-tool.json
@@ -1,6 +1,6 @@
 {
   "name": "Create a Deep Flattening Tool",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-depth-first-search.json b/curriculum/structure/blocks/lab-depth-first-search.json
index 4b7addffe6f..f2730de5580 100644
--- a/curriculum/structure/blocks/lab-depth-first-search.json
+++ b/curriculum/structure/blocks/lab-depth-first-search.json
@@ -10,6 +10,6 @@
       "title": "Implement the Depth-First Search Algorithm"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/lab-dna-pair-generator.json b/curriculum/structure/blocks/lab-dna-pair-generator.json
index 8d89602134f..066f9908bf7 100644
--- a/curriculum/structure/blocks/lab-dna-pair-generator.json
+++ b/curriculum/structure/blocks/lab-dna-pair-generator.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-dna-pair-generator",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "challengeOrder": [
     {
       "id": "afd15382cdfb22c9efe8b7de",
diff --git a/curriculum/structure/blocks/lab-drum-machine.json b/curriculum/structure/blocks/lab-drum-machine.json
index 3ae3931c2a1..eba5b031f56 100644
--- a/curriculum/structure/blocks/lab-drum-machine.json
+++ b/curriculum/structure/blocks/lab-drum-machine.json
@@ -8,5 +8,5 @@
   "helpCategory": "JavaScript",
   "isUpcomingChange": false,
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-element-skipper.json b/curriculum/structure/blocks/lab-element-skipper.json
index d64206e09ab..e45414e2083 100644
--- a/curriculum/structure/blocks/lab-element-skipper.json
+++ b/curriculum/structure/blocks/lab-element-skipper.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-element-skipper",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true,
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lab-email-masker.json b/curriculum/structure/blocks/lab-email-masker.json
index d2a6266695a..dd8b10f42be 100644
--- a/curriculum/structure/blocks/lab-email-masker.json
+++ b/curriculum/structure/blocks/lab-email-masker.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an Email Masker",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-event-flyer-page.json b/curriculum/structure/blocks/lab-event-flyer-page.json
index 99763e54a8b..eafb98f55e7 100644
--- a/curriculum/structure/blocks/lab-event-flyer-page.json
+++ b/curriculum/structure/blocks/lab-event-flyer-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an Event Flyer Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-event-hub.json b/curriculum/structure/blocks/lab-event-hub.json
index 84dcb73b5da..9323aa0c261 100644
--- a/curriculum/structure/blocks/lab-event-hub.json
+++ b/curriculum/structure/blocks/lab-event-hub.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an Event Hub",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-event-rsvp.json b/curriculum/structure/blocks/lab-event-rsvp.json
index c68ac397b46..9cb19acd1e1 100644
--- a/curriculum/structure/blocks/lab-event-rsvp.json
+++ b/curriculum/structure/blocks/lab-event-rsvp.json
@@ -11,5 +11,5 @@
   "helpCategory": "JavaScript",
   "isUpcomingChange": false,
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-factorial-calculator.json b/curriculum/structure/blocks/lab-factorial-calculator.json
index 1b6f9ccb375..d8817f15c9a 100644
--- a/curriculum/structure/blocks/lab-factorial-calculator.json
+++ b/curriculum/structure/blocks/lab-factorial-calculator.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Factorial Calculator ",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-falsy-remover.json b/curriculum/structure/blocks/lab-falsy-remover.json
index a498ab2a94d..77672cf72ca 100644
--- a/curriculum/structure/blocks/lab-falsy-remover.json
+++ b/curriculum/structure/blocks/lab-falsy-remover.json
@@ -7,6 +7,6 @@
     { "id": "adf08ec01beb4f99fc7a68f2", "title": "Implement a Falsy Remover" }
   ],
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-favorite-icon-toggler.json b/curriculum/structure/blocks/lab-favorite-icon-toggler.json
index bbb8cf47ddd..56045edf738 100644
--- a/curriculum/structure/blocks/lab-favorite-icon-toggler.json
+++ b/curriculum/structure/blocks/lab-favorite-icon-toggler.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Favorite Icon Toggler",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-fcc-forum-leaderboard.json b/curriculum/structure/blocks/lab-fcc-forum-leaderboard.json
index 9aee1b4e1e6..bf19d33d84c 100644
--- a/curriculum/structure/blocks/lab-fcc-forum-leaderboard.json
+++ b/curriculum/structure/blocks/lab-fcc-forum-leaderboard.json
@@ -2,7 +2,7 @@
   "name": "Build an fCC Forum Leaderboard",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-fcc-forum-leaderboard",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lab-feature-selection.json b/curriculum/structure/blocks/lab-feature-selection.json
index 0fcfc541e5e..c3d0ada54bd 100644
--- a/curriculum/structure/blocks/lab-feature-selection.json
+++ b/curriculum/structure/blocks/lab-feature-selection.json
@@ -10,6 +10,6 @@
       "title": "Design a Feature Selection Page"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/lab-first-element-finder.json b/curriculum/structure/blocks/lab-first-element-finder.json
index 2048e701166..f59aa42daa9 100644
--- a/curriculum/structure/blocks/lab-first-element-finder.json
+++ b/curriculum/structure/blocks/lab-first-element-finder.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a First Element Finder",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "lab-first-element-finder",
diff --git a/curriculum/structure/blocks/lab-football-team-cards.json b/curriculum/structure/blocks/lab-football-team-cards.json
index a495be33c8c..22d049f3d18 100644
--- a/curriculum/structure/blocks/lab-football-team-cards.json
+++ b/curriculum/structure/blocks/lab-football-team-cards.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Set of Football Team Cards",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-fortune-teller.json b/curriculum/structure/blocks/lab-fortune-teller.json
index 6009f25a31d..daf89e5d507 100644
--- a/curriculum/structure/blocks/lab-fortune-teller.json
+++ b/curriculum/structure/blocks/lab-fortune-teller.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Fortune Teller App",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-golf-score-translator.json b/curriculum/structure/blocks/lab-golf-score-translator.json
index a6bac9855b7..79ebfbecfbb 100644
--- a/curriculum/structure/blocks/lab-golf-score-translator.json
+++ b/curriculum/structure/blocks/lab-golf-score-translator.json
@@ -9,7 +9,7 @@
       "title": "Build a Golf Score Translator"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/lab-gradebook-app.json b/curriculum/structure/blocks/lab-gradebook-app.json
index 75de5ed9b52..cc3e785a0b3 100644
--- a/curriculum/structure/blocks/lab-gradebook-app.json
+++ b/curriculum/structure/blocks/lab-gradebook-app.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Gradebook App",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-hash-table.json b/curriculum/structure/blocks/lab-hash-table.json
index c607f107fb4..43ca82b0741 100644
--- a/curriculum/structure/blocks/lab-hash-table.json
+++ b/curriculum/structure/blocks/lab-hash-table.json
@@ -7,5 +7,5 @@
   ],
   "helpCategory": "Python",
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-house-painting.json b/curriculum/structure/blocks/lab-house-painting.json
index 72b1bf98729..081c982babf 100644
--- a/curriculum/structure/blocks/lab-house-painting.json
+++ b/curriculum/structure/blocks/lab-house-painting.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a House Painting",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-html-audio-and-video-player.json b/curriculum/structure/blocks/lab-html-audio-and-video-player.json
index 049d8d3e490..8a0b4d254fd 100644
--- a/curriculum/structure/blocks/lab-html-audio-and-video-player.json
+++ b/curriculum/structure/blocks/lab-html-audio-and-video-player.json
@@ -10,6 +10,6 @@
       "title": "Build an HTML Audio and Video Player"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/lab-html-entitiy-converter.json b/curriculum/structure/blocks/lab-html-entitiy-converter.json
index f48bc670c9e..0b145fbb7e2 100644
--- a/curriculum/structure/blocks/lab-html-entitiy-converter.json
+++ b/curriculum/structure/blocks/lab-html-entitiy-converter.json
@@ -10,6 +10,6 @@
     }
   ],
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-inventory-management-program.json b/curriculum/structure/blocks/lab-inventory-management-program.json
index 31c005b535d..4e3897fdcb5 100644
--- a/curriculum/structure/blocks/lab-inventory-management-program.json
+++ b/curriculum/structure/blocks/lab-inventory-management-program.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an Inventory Management Program",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-isbn-validator.json b/curriculum/structure/blocks/lab-isbn-validator.json
index 44094f0bcec..16c7758a04c 100644
--- a/curriculum/structure/blocks/lab-isbn-validator.json
+++ b/curriculum/structure/blocks/lab-isbn-validator.json
@@ -7,5 +7,5 @@
     { "id": "686b9720ee1d032bd77a480a", "title": "Debug an ISBN Validator" }
   ],
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-javascript-trivia-bot.json b/curriculum/structure/blocks/lab-javascript-trivia-bot.json
index 43df2e36f0c..99eb59758d7 100644
--- a/curriculum/structure/blocks/lab-javascript-trivia-bot.json
+++ b/curriculum/structure/blocks/lab-javascript-trivia-bot.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a JavaScript Trivia Bot",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-job-application-form.json b/curriculum/structure/blocks/lab-job-application-form.json
index 2b08e8782ec..5db469dd755 100644
--- a/curriculum/structure/blocks/lab-job-application-form.json
+++ b/curriculum/structure/blocks/lab-job-application-form.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Job Application Form",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-largest-number-finder.json b/curriculum/structure/blocks/lab-largest-number-finder.json
index 5b1d6ebae13..6fd37da371f 100644
--- a/curriculum/structure/blocks/lab-largest-number-finder.json
+++ b/curriculum/structure/blocks/lab-largest-number-finder.json
@@ -10,6 +10,6 @@
     }
   ],
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-leap-year-calculator.json b/curriculum/structure/blocks/lab-leap-year-calculator.json
index edd77b83732..b9014a138f2 100644
--- a/curriculum/structure/blocks/lab-leap-year-calculator.json
+++ b/curriculum/structure/blocks/lab-leap-year-calculator.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Leap Year Calculator ",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-lightbox-viewer.json b/curriculum/structure/blocks/lab-lightbox-viewer.json
index 94901548dd7..a1b07279918 100644
--- a/curriculum/structure/blocks/lab-lightbox-viewer.json
+++ b/curriculum/structure/blocks/lab-lightbox-viewer.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Lightbox Viewer",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-longest-word-in-a-string.json b/curriculum/structure/blocks/lab-longest-word-in-a-string.json
index 131f4485f49..b8195b44709 100644
--- a/curriculum/structure/blocks/lab-longest-word-in-a-string.json
+++ b/curriculum/structure/blocks/lab-longest-word-in-a-string.json
@@ -10,6 +10,6 @@
     }
   ],
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-luhn-algorithm.json b/curriculum/structure/blocks/lab-luhn-algorithm.json
index b4f8a79ddf3..1f53183a682 100644
--- a/curriculum/structure/blocks/lab-luhn-algorithm.json
+++ b/curriculum/structure/blocks/lab-luhn-algorithm.json
@@ -10,5 +10,5 @@
     }
   ],
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-lunch-picker-program.json b/curriculum/structure/blocks/lab-lunch-picker-program.json
index fdc2cadb2f2..498720a48b4 100644
--- a/curriculum/structure/blocks/lab-lunch-picker-program.json
+++ b/curriculum/structure/blocks/lab-lunch-picker-program.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Lunch Picker Program",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-markdown-to-html-converter.json b/curriculum/structure/blocks/lab-markdown-to-html-converter.json
index 4e07daf04b1..80e9c8ab3fc 100644
--- a/curriculum/structure/blocks/lab-markdown-to-html-converter.json
+++ b/curriculum/structure/blocks/lab-markdown-to-html-converter.json
@@ -2,7 +2,7 @@
   "name": "Build a Markdown to HTML Converter",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-markdown-to-html-converter",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lab-matching-object-filter.json b/curriculum/structure/blocks/lab-matching-object-filter.json
index 9d7ecc1270b..97ba2810b35 100644
--- a/curriculum/structure/blocks/lab-matching-object-filter.json
+++ b/curriculum/structure/blocks/lab-matching-object-filter.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-matching-object-filter",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true,
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lab-missing-letter-detector.json b/curriculum/structure/blocks/lab-missing-letter-detector.json
index c0ee2105001..6d8f2caa388 100644
--- a/curriculum/structure/blocks/lab-missing-letter-detector.json
+++ b/curriculum/structure/blocks/lab-missing-letter-detector.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Missing Letter Detector",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-mood-board.json b/curriculum/structure/blocks/lab-mood-board.json
index 7419f05c1e9..b724f9406dc 100644
--- a/curriculum/structure/blocks/lab-mood-board.json
+++ b/curriculum/structure/blocks/lab-mood-board.json
@@ -8,5 +8,5 @@
   ],
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-moon-orbit.json b/curriculum/structure/blocks/lab-moon-orbit.json
index 985f8d31b6f..0cc3da18407 100644
--- a/curriculum/structure/blocks/lab-moon-orbit.json
+++ b/curriculum/structure/blocks/lab-moon-orbit.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Moon Orbit",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-movie-review-page.json b/curriculum/structure/blocks/lab-movie-review-page.json
index 6d2351f3d4b..f84ee7e91bb 100644
--- a/curriculum/structure/blocks/lab-movie-review-page.json
+++ b/curriculum/structure/blocks/lab-movie-review-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Design a Movie Review Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-multimedia-player.json b/curriculum/structure/blocks/lab-multimedia-player.json
index 0b840be176a..c5582f9e182 100644
--- a/curriculum/structure/blocks/lab-multimedia-player.json
+++ b/curriculum/structure/blocks/lab-multimedia-player.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Multimedia Player",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-music-shopping-cart-page.json b/curriculum/structure/blocks/lab-music-shopping-cart-page.json
index 5e1a06c4b42..2f676fbd220 100644
--- a/curriculum/structure/blocks/lab-music-shopping-cart-page.json
+++ b/curriculum/structure/blocks/lab-music-shopping-cart-page.json
@@ -2,7 +2,7 @@
   "name": "Build a Music Shopping Cart Page",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-music-shopping-cart-page",
   "helpCategory": "HTML-CSS",
diff --git a/curriculum/structure/blocks/lab-mutations.json b/curriculum/structure/blocks/lab-mutations.json
index 665b79d0907..b0e21036d8f 100644
--- a/curriculum/structure/blocks/lab-mutations.json
+++ b/curriculum/structure/blocks/lab-mutations.json
@@ -1,6 +1,6 @@
 {
   "name": "Implement the Mutations Algorithm",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-n-queens-problem.json b/curriculum/structure/blocks/lab-n-queens-problem.json
index 512f3bd6ef7..b10873227aa 100644
--- a/curriculum/structure/blocks/lab-n-queens-problem.json
+++ b/curriculum/structure/blocks/lab-n-queens-problem.json
@@ -10,6 +10,6 @@
       "title": "Implement the N-Queens Algorithm"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/lab-newspaper-article.json b/curriculum/structure/blocks/lab-newspaper-article.json
index 07c7d04170c..fc582796abb 100644
--- a/curriculum/structure/blocks/lab-newspaper-article.json
+++ b/curriculum/structure/blocks/lab-newspaper-article.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Newspaper Article",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-newspaper-layout.json b/curriculum/structure/blocks/lab-newspaper-layout.json
index 36dfa8fc842..f44727f2fbf 100644
--- a/curriculum/structure/blocks/lab-newspaper-layout.json
+++ b/curriculum/structure/blocks/lab-newspaper-layout.json
@@ -8,5 +8,5 @@
   ],
   "helpCategory": "HTML-CSS",
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-nth-fibonacci-number.json b/curriculum/structure/blocks/lab-nth-fibonacci-number.json
index d43269f9870..e4987e93ea2 100644
--- a/curriculum/structure/blocks/lab-nth-fibonacci-number.json
+++ b/curriculum/structure/blocks/lab-nth-fibonacci-number.json
@@ -10,6 +10,6 @@
       "title": "Build an Nth Fibonacci Number Calculator"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/lab-number-guessing-game.json b/curriculum/structure/blocks/lab-number-guessing-game.json
index f562273c348..75ae576cf22 100644
--- a/curriculum/structure/blocks/lab-number-guessing-game.json
+++ b/curriculum/structure/blocks/lab-number-guessing-game.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Number Guessing Game",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "lab-number-guessing-game",
diff --git a/curriculum/structure/blocks/lab-number-pattern-generator.json b/curriculum/structure/blocks/lab-number-pattern-generator.json
index 24dca32620a..1b59af7c86a 100644
--- a/curriculum/structure/blocks/lab-number-pattern-generator.json
+++ b/curriculum/structure/blocks/lab-number-pattern-generator.json
@@ -1,7 +1,7 @@
 {
   "name": "Build a Number Pattern Generator",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "isUpcomingChange": false,
   "dashedName": "lab-number-pattern-generator",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lab-odd-fibonacci-sum-calculator.json b/curriculum/structure/blocks/lab-odd-fibonacci-sum-calculator.json
index 43a27e7eb33..0a6111cf7fd 100644
--- a/curriculum/structure/blocks/lab-odd-fibonacci-sum-calculator.json
+++ b/curriculum/structure/blocks/lab-odd-fibonacci-sum-calculator.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-odd-fibonacci-sum-calculator",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true,
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lab-one-time-password-generator.json b/curriculum/structure/blocks/lab-one-time-password-generator.json
index 847b9156555..5adafe6b17a 100644
--- a/curriculum/structure/blocks/lab-one-time-password-generator.json
+++ b/curriculum/structure/blocks/lab-one-time-password-generator.json
@@ -9,7 +9,7 @@
       "title": "Build a One-Time Password Generator"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "helpCategory": "JavaScript"
 }
diff --git a/curriculum/structure/blocks/lab-optional-arguments-sum-function.json b/curriculum/structure/blocks/lab-optional-arguments-sum-function.json
index f2b2407834d..9d26f939626 100644
--- a/curriculum/structure/blocks/lab-optional-arguments-sum-function.json
+++ b/curriculum/structure/blocks/lab-optional-arguments-sum-function.json
@@ -1,7 +1,7 @@
 {
   "name": "Build an Optional Arguments Sum Function",
   "isUpcomingChange": false,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-optional-arguments-sum-function",
   "helpCategory": "JavaScript",
diff --git a/curriculum/structure/blocks/lab-page-of-playing-cards.json b/curriculum/structure/blocks/lab-page-of-playing-cards.json
index ab63cf93adb..c09e3a1d573 100644
--- a/curriculum/structure/blocks/lab-page-of-playing-cards.json
+++ b/curriculum/structure/blocks/lab-page-of-playing-cards.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Page of Playing Cards",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-palindrome-checker.json b/curriculum/structure/blocks/lab-palindrome-checker.json
index 6b1fade32a0..2d3274cff9a 100644
--- a/curriculum/structure/blocks/lab-palindrome-checker.json
+++ b/curriculum/structure/blocks/lab-palindrome-checker.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Palindrome Checker",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-password-generator.json b/curriculum/structure/blocks/lab-password-generator.json
index 45ac8aa0ed9..bb263153a45 100644
--- a/curriculum/structure/blocks/lab-password-generator.json
+++ b/curriculum/structure/blocks/lab-password-generator.json
@@ -2,7 +2,7 @@
   "name": "Build a Password Generator App",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "dashedName": "lab-password-generator",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lab-periodic-table-database.json b/curriculum/structure/blocks/lab-periodic-table-database.json
index 416785868bc..27858cd4d12 100644
--- a/curriculum/structure/blocks/lab-periodic-table-database.json
+++ b/curriculum/structure/blocks/lab-periodic-table-database.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Periodic Table Database",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "lab-periodic-table-database",
diff --git a/curriculum/structure/blocks/lab-permutation-generator.json b/curriculum/structure/blocks/lab-permutation-generator.json
index e6c4ef03ea8..e084a632f7c 100644
--- a/curriculum/structure/blocks/lab-permutation-generator.json
+++ b/curriculum/structure/blocks/lab-permutation-generator.json
@@ -10,6 +10,6 @@
     }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-personal-portfolio.json b/curriculum/structure/blocks/lab-personal-portfolio.json
index 799bb0b3460..2a0cf74772f 100644
--- a/curriculum/structure/blocks/lab-personal-portfolio.json
+++ b/curriculum/structure/blocks/lab-personal-portfolio.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Personal Portfolio",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-photography-exhibit.json b/curriculum/structure/blocks/lab-photography-exhibit.json
index 302c1e6ec89..64272092029 100644
--- a/curriculum/structure/blocks/lab-photography-exhibit.json
+++ b/curriculum/structure/blocks/lab-photography-exhibit.json
@@ -1,6 +1,6 @@
 {
   "name": "Design a Photography Exhibit",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "lab-photography-exhibit",
diff --git a/curriculum/structure/blocks/lab-pig-latin.json b/curriculum/structure/blocks/lab-pig-latin.json
index 976b7fde6c2..06896a0d6c5 100644
--- a/curriculum/structure/blocks/lab-pig-latin.json
+++ b/curriculum/structure/blocks/lab-pig-latin.json
@@ -1,6 +1,6 @@
 {
   "name": "Implement a Pig Latin Translator",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-polygon-area-calculator.json b/curriculum/structure/blocks/lab-polygon-area-calculator.json
index f0ed467f872..ff2a868f316 100644
--- a/curriculum/structure/blocks/lab-polygon-area-calculator.json
+++ b/curriculum/structure/blocks/lab-polygon-area-calculator.json
@@ -10,5 +10,5 @@
   ],
   "helpCategory": "Python",
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-prime-number-sum-calculator.json b/curriculum/structure/blocks/lab-prime-number-sum-calculator.json
index 36dfa69a8b1..67ea685a14d 100644
--- a/curriculum/structure/blocks/lab-prime-number-sum-calculator.json
+++ b/curriculum/structure/blocks/lab-prime-number-sum-calculator.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-prime-number-sum-calculator",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true,
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lab-product-landing-page.json b/curriculum/structure/blocks/lab-product-landing-page.json
index 26e9ae6fd8f..fe44e39b903 100644
--- a/curriculum/structure/blocks/lab-product-landing-page.json
+++ b/curriculum/structure/blocks/lab-product-landing-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Product Landing Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-profile-lookup.json b/curriculum/structure/blocks/lab-profile-lookup.json
index 41ca3e11116..018d8315258 100644
--- a/curriculum/structure/blocks/lab-profile-lookup.json
+++ b/curriculum/structure/blocks/lab-profile-lookup.json
@@ -1,7 +1,7 @@
 {
   "name": "Build a Profile Lookup",
   "isUpcomingChange": false,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-profile-lookup",
   "helpCategory": "JavaScript",
diff --git a/curriculum/structure/blocks/lab-project-idea-board.json b/curriculum/structure/blocks/lab-project-idea-board.json
index 596238fa794..adda47df9fa 100644
--- a/curriculum/structure/blocks/lab-project-idea-board.json
+++ b/curriculum/structure/blocks/lab-project-idea-board.json
@@ -7,6 +7,6 @@
     { "id": "67051431a73f1ca25d9a6f25", "title": "Build a Project Idea Board" }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-pyramid-generator.json b/curriculum/structure/blocks/lab-pyramid-generator.json
index 1b348b25178..346d339eeea 100644
--- a/curriculum/structure/blocks/lab-pyramid-generator.json
+++ b/curriculum/structure/blocks/lab-pyramid-generator.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Pyramid Generator",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-quicksort.json b/curriculum/structure/blocks/lab-quicksort.json
index 2a51dc6f950..01d29dc9798 100644
--- a/curriculum/structure/blocks/lab-quicksort.json
+++ b/curriculum/structure/blocks/lab-quicksort.json
@@ -4,7 +4,7 @@
   "usesMultifileEditor": true,
   "dashedName": "lab-quicksort",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "challengeOrder": [
     {
       "id": "681dbcca65bbda5f286dc0ca",
diff --git a/curriculum/structure/blocks/lab-quiz-game.json b/curriculum/structure/blocks/lab-quiz-game.json
index 473df43343e..8241bf6c484 100644
--- a/curriculum/structure/blocks/lab-quiz-game.json
+++ b/curriculum/structure/blocks/lab-quiz-game.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Quiz Game",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-random-background-color-changer.json b/curriculum/structure/blocks/lab-random-background-color-changer.json
index e0798ca45c0..c697285403a 100644
--- a/curriculum/structure/blocks/lab-random-background-color-changer.json
+++ b/curriculum/structure/blocks/lab-random-background-color-changer.json
@@ -1,7 +1,7 @@
 {
   "name": "Debug a Random Background Color Changer",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
   "dashedName": "lab-random-background-color-changer",
diff --git a/curriculum/structure/blocks/lab-range-based-lcm-calculator.json b/curriculum/structure/blocks/lab-range-based-lcm-calculator.json
index ff78368b52b..cd36d14e0fd 100644
--- a/curriculum/structure/blocks/lab-range-based-lcm-calculator.json
+++ b/curriculum/structure/blocks/lab-range-based-lcm-calculator.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-range-based-lcm-calculator",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true,
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lab-real-time-counter.json b/curriculum/structure/blocks/lab-real-time-counter.json
index a5552b28ca7..951857f0524 100644
--- a/curriculum/structure/blocks/lab-real-time-counter.json
+++ b/curriculum/structure/blocks/lab-real-time-counter.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Real Time Counter",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-recipe-page.json b/curriculum/structure/blocks/lab-recipe-page.json
index 47d35acad4f..9b892262205 100644
--- a/curriculum/structure/blocks/lab-recipe-page.json
+++ b/curriculum/structure/blocks/lab-recipe-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Recipe Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-record-collection.json b/curriculum/structure/blocks/lab-record-collection.json
index 4d7bd72ab53..418b06fc89d 100644
--- a/curriculum/structure/blocks/lab-record-collection.json
+++ b/curriculum/structure/blocks/lab-record-collection.json
@@ -7,6 +7,6 @@
     { "id": "56533eb9ac21ba0edf2244cf", "title": "Build a Record Collection" }
   ],
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-regex-sandbox.json b/curriculum/structure/blocks/lab-regex-sandbox.json
index 24e55dea8bc..fec2a9cfb6f 100644
--- a/curriculum/structure/blocks/lab-regex-sandbox.json
+++ b/curriculum/structure/blocks/lab-regex-sandbox.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a RegEx Sandbox",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-repeat-a-string.json b/curriculum/structure/blocks/lab-repeat-a-string.json
index 1442496cd32..70b05bcade1 100644
--- a/curriculum/structure/blocks/lab-repeat-a-string.json
+++ b/curriculum/structure/blocks/lab-repeat-a-string.json
@@ -10,6 +10,6 @@
     }
   ],
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-reusable-footer.json b/curriculum/structure/blocks/lab-reusable-footer.json
index 15f58501b46..aea849168a1 100644
--- a/curriculum/structure/blocks/lab-reusable-footer.json
+++ b/curriculum/structure/blocks/lab-reusable-footer.json
@@ -8,5 +8,5 @@
   ],
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-reverse-a-string.json b/curriculum/structure/blocks/lab-reverse-a-string.json
index 81a2770f14a..7b0b910e441 100644
--- a/curriculum/structure/blocks/lab-reverse-a-string.json
+++ b/curriculum/structure/blocks/lab-reverse-a-string.json
@@ -1,7 +1,7 @@
 {
   "name": "Build a String Inverter",
   "isUpcomingChange": false,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-reverse-a-string",
   "helpCategory": "JavaScript",
diff --git a/curriculum/structure/blocks/lab-rpg-character.json b/curriculum/structure/blocks/lab-rpg-character.json
index 9d5d3153b71..aaa6140c91a 100644
--- a/curriculum/structure/blocks/lab-rpg-character.json
+++ b/curriculum/structure/blocks/lab-rpg-character.json
@@ -7,5 +7,5 @@
   ],
   "helpCategory": "Python",
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-salon-appointment-scheduler.json b/curriculum/structure/blocks/lab-salon-appointment-scheduler.json
index 67a7404a17e..166509fbc79 100644
--- a/curriculum/structure/blocks/lab-salon-appointment-scheduler.json
+++ b/curriculum/structure/blocks/lab-salon-appointment-scheduler.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Salon Appointment Scheduler",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "lab-salon-appointment-scheduler",
diff --git a/curriculum/structure/blocks/lab-selection-sort.json b/curriculum/structure/blocks/lab-selection-sort.json
index c4b6dda6d74..e06e7ca0cc1 100644
--- a/curriculum/structure/blocks/lab-selection-sort.json
+++ b/curriculum/structure/blocks/lab-selection-sort.json
@@ -7,5 +7,5 @@
   ],
   "helpCategory": "Python",
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-sentence-maker.json b/curriculum/structure/blocks/lab-sentence-maker.json
index 54d189c23e0..9a8ad21c467 100644
--- a/curriculum/structure/blocks/lab-sentence-maker.json
+++ b/curriculum/structure/blocks/lab-sentence-maker.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Sentence Maker",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-slice-and-splice.json b/curriculum/structure/blocks/lab-slice-and-splice.json
index 5a50f7efdb1..4df1f5899e1 100644
--- a/curriculum/structure/blocks/lab-slice-and-splice.json
+++ b/curriculum/structure/blocks/lab-slice-and-splice.json
@@ -1,6 +1,6 @@
 {
   "name": "Implement the Slice and Splice Algorithm",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-smart-word-replacement.json b/curriculum/structure/blocks/lab-smart-word-replacement.json
index a722405d40a..eca998c76cb 100644
--- a/curriculum/structure/blocks/lab-smart-word-replacement.json
+++ b/curriculum/structure/blocks/lab-smart-word-replacement.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-smart-word-replacement",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "challengeOrder": [
     {
       "id": "a0b5010f579e69b815e7c5d6",
diff --git a/curriculum/structure/blocks/lab-sorted-index-finder.json b/curriculum/structure/blocks/lab-sorted-index-finder.json
index 7365fab11a4..8571d4ee688 100644
--- a/curriculum/structure/blocks/lab-sorted-index-finder.json
+++ b/curriculum/structure/blocks/lab-sorted-index-finder.json
@@ -10,6 +10,6 @@
     }
   ],
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-sorting-visualizer.json b/curriculum/structure/blocks/lab-sorting-visualizer.json
index b4219be9312..9c18ea2b06b 100644
--- a/curriculum/structure/blocks/lab-sorting-visualizer.json
+++ b/curriculum/structure/blocks/lab-sorting-visualizer.json
@@ -2,7 +2,7 @@
   "name": "Build a Sorting Visualizer",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-sorting-visualizer",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lab-spinal-case-converter.json b/curriculum/structure/blocks/lab-spinal-case-converter.json
index d6599745735..f7cf2759c8f 100644
--- a/curriculum/structure/blocks/lab-spinal-case-converter.json
+++ b/curriculum/structure/blocks/lab-spinal-case-converter.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-spinal-case-converter",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "challengeOrder": [
     {
       "id": "a103376db3ba46b2d50db289",
diff --git a/curriculum/structure/blocks/lab-string-ending-checker.json b/curriculum/structure/blocks/lab-string-ending-checker.json
index 31a73c1701a..c530be69851 100644
--- a/curriculum/structure/blocks/lab-string-ending-checker.json
+++ b/curriculum/structure/blocks/lab-string-ending-checker.json
@@ -9,7 +9,7 @@
       "title": "Build a Confirm the Ending Tool"
     }
   ],
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/lab-stylized-to-do-list.json b/curriculum/structure/blocks/lab-stylized-to-do-list.json
index 6e901fb69db..79cfd4d3bfd 100644
--- a/curriculum/structure/blocks/lab-stylized-to-do-list.json
+++ b/curriculum/structure/blocks/lab-stylized-to-do-list.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Stylized To-Do List",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-sum-all-numbers-algorithm.json b/curriculum/structure/blocks/lab-sum-all-numbers-algorithm.json
index d42f13cddcc..c78441dba83 100644
--- a/curriculum/structure/blocks/lab-sum-all-numbers-algorithm.json
+++ b/curriculum/structure/blocks/lab-sum-all-numbers-algorithm.json
@@ -2,7 +2,7 @@
   "name": "Design a Sum All Numbers Algorithm",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-sum-all-numbers-algorithm",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lab-survey-form.json b/curriculum/structure/blocks/lab-survey-form.json
index dc79444f8a2..235966df00a 100644
--- a/curriculum/structure/blocks/lab-survey-form.json
+++ b/curriculum/structure/blocks/lab-survey-form.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Survey Form",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-symmetric-difference.json b/curriculum/structure/blocks/lab-symmetric-difference.json
index f63026eba8d..5bdd78be28d 100644
--- a/curriculum/structure/blocks/lab-symmetric-difference.json
+++ b/curriculum/structure/blocks/lab-symmetric-difference.json
@@ -10,5 +10,5 @@
     }
   ],
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-technical-documentation-page.json b/curriculum/structure/blocks/lab-technical-documentation-page.json
index 5dcdefa53e0..605541743ca 100644
--- a/curriculum/structure/blocks/lab-technical-documentation-page.json
+++ b/curriculum/structure/blocks/lab-technical-documentation-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Technical Documentation Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-theme-switcher.json b/curriculum/structure/blocks/lab-theme-switcher.json
index 4554dd28ec0..c023480a10c 100644
--- a/curriculum/structure/blocks/lab-theme-switcher.json
+++ b/curriculum/structure/blocks/lab-theme-switcher.json
@@ -1,7 +1,7 @@
 {
   "name": "Build a Theme Switcher",
   "isUpcomingChange": false,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-theme-switcher",
   "helpCategory": "JavaScript",
diff --git a/curriculum/structure/blocks/lab-tic-tac-toe.json b/curriculum/structure/blocks/lab-tic-tac-toe.json
index 11257e5b873..c8b670e1590 100644
--- a/curriculum/structure/blocks/lab-tic-tac-toe.json
+++ b/curriculum/structure/blocks/lab-tic-tac-toe.json
@@ -11,5 +11,5 @@
   "helpCategory": "JavaScript",
   "isUpcomingChange": false,
   "blockLayout": "link",
-  "blockType": "lab"
+  "blockLabel": "lab"
 }
diff --git a/curriculum/structure/blocks/lab-title-case-converter.json b/curriculum/structure/blocks/lab-title-case-converter.json
index 3230dd119d7..6ed8536f1ab 100644
--- a/curriculum/structure/blocks/lab-title-case-converter.json
+++ b/curriculum/structure/blocks/lab-title-case-converter.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-title-case-converter",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "challengeOrder": [
     {
       "id": "ab6137d4e35944e21037b769",
diff --git a/curriculum/structure/blocks/lab-tower-of-hanoi.json b/curriculum/structure/blocks/lab-tower-of-hanoi.json
index 28653d1e316..c42ac7243df 100644
--- a/curriculum/structure/blocks/lab-tower-of-hanoi.json
+++ b/curriculum/structure/blocks/lab-tower-of-hanoi.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": true,
   "dashedName": "lab-tower-of-hanoi",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "helpCategory": "Python",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lab-travel-agency-page.json b/curriculum/structure/blocks/lab-travel-agency-page.json
index 24f388ff2d3..1014746f097 100644
--- a/curriculum/structure/blocks/lab-travel-agency-page.json
+++ b/curriculum/structure/blocks/lab-travel-agency-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Travel Agency Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-tribute-page.json b/curriculum/structure/blocks/lab-tribute-page.json
index 709745debd6..6fccb6e1a0e 100644
--- a/curriculum/structure/blocks/lab-tribute-page.json
+++ b/curriculum/structure/blocks/lab-tribute-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Tribute Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-truncate-string.json b/curriculum/structure/blocks/lab-truncate-string.json
index dda8b1310c7..c3ba994ecfb 100644
--- a/curriculum/structure/blocks/lab-truncate-string.json
+++ b/curriculum/structure/blocks/lab-truncate-string.json
@@ -2,7 +2,7 @@
   "name": "Implement the Truncate a String Algorithm",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "dashedName": "lab-truncate-string",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lab-unique-sorted-union.json b/curriculum/structure/blocks/lab-unique-sorted-union.json
index bb39099e161..9b2f20e33b9 100644
--- a/curriculum/structure/blocks/lab-unique-sorted-union.json
+++ b/curriculum/structure/blocks/lab-unique-sorted-union.json
@@ -1,6 +1,6 @@
 {
   "name": "Implement a Unique Sorted Union",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-user-configuration-manager.json b/curriculum/structure/blocks/lab-user-configuration-manager.json
index cf791effabe..7e83be89fcc 100644
--- a/curriculum/structure/blocks/lab-user-configuration-manager.json
+++ b/curriculum/structure/blocks/lab-user-configuration-manager.json
@@ -9,6 +9,6 @@
     }
   ],
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "helpCategory": "Python"
 }
diff --git a/curriculum/structure/blocks/lab-value-remover-function.json b/curriculum/structure/blocks/lab-value-remover-function.json
index 2f1d061e57f..c961dfc5c0b 100644
--- a/curriculum/structure/blocks/lab-value-remover-function.json
+++ b/curriculum/structure/blocks/lab-value-remover-function.json
@@ -4,7 +4,7 @@
   "dashedName": "lab-value-remover-function",
   "helpCategory": "JavaScript",
   "blockLayout": "link",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "usesMultifileEditor": true,
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lab-video-compilation-page.json b/curriculum/structure/blocks/lab-video-compilation-page.json
index 3649b0b4045..ba0e3166b04 100644
--- a/curriculum/structure/blocks/lab-video-compilation-page.json
+++ b/curriculum/structure/blocks/lab-video-compilation-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Video Compilation Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lab-voting-system.json b/curriculum/structure/blocks/lab-voting-system.json
index 74f24d5f660..139406e4966 100644
--- a/curriculum/structure/blocks/lab-voting-system.json
+++ b/curriculum/structure/blocks/lab-voting-system.json
@@ -7,6 +7,6 @@
     { "id": "673b567e3ba535dda140d278", "title": "Build a Voting System" }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-weather-app.json b/curriculum/structure/blocks/lab-weather-app.json
index ad7c050d82c..765905dbb4b 100644
--- a/curriculum/structure/blocks/lab-weather-app.json
+++ b/curriculum/structure/blocks/lab-weather-app.json
@@ -7,6 +7,6 @@
     { "id": "66f12a88741aeb16b9246c59", "title": "Build a Weather App" }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/lab-world-cup-database.json b/curriculum/structure/blocks/lab-world-cup-database.json
index 6092268e01c..f0a383e4b93 100644
--- a/curriculum/structure/blocks/lab-world-cup-database.json
+++ b/curriculum/structure/blocks/lab-world-cup-database.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a World Cup Database",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/lecture-accessible-media-elements.json b/curriculum/structure/blocks/lecture-accessible-media-elements.json
index 42ca61b21ff..53b2662e71d 100644
--- a/curriculum/structure/blocks/lecture-accessible-media-elements.json
+++ b/curriculum/structure/blocks/lecture-accessible-media-elements.json
@@ -1,7 +1,7 @@
 {
   "name": "Working with Accessible Media Elements",
   "isUpcomingChange": false,
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "dashedName": "lecture-accessible-media-elements",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lecture-accessible-tables-forms.json b/curriculum/structure/blocks/lecture-accessible-tables-forms.json
index 8f4f4d7e9c1..d4c49f19aa7 100644
--- a/curriculum/structure/blocks/lecture-accessible-tables-forms.json
+++ b/curriculum/structure/blocks/lecture-accessible-tables-forms.json
@@ -1,7 +1,7 @@
 {
   "name": "Working with Accessible Tables and Forms",
   "isUpcomingChange": false,
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "dashedName": "lecture-accessible-tables-forms",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lecture-animations-and-accessibility.json b/curriculum/structure/blocks/lecture-animations-and-accessibility.json
index 87fcfc3d137..fe0a9fd7a99 100644
--- a/curriculum/structure/blocks/lecture-animations-and-accessibility.json
+++ b/curriculum/structure/blocks/lecture-animations-and-accessibility.json
@@ -1,6 +1,6 @@
 {
   "name": "Animations and Accessibility",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-animations-and-accessibility",
diff --git a/curriculum/structure/blocks/lecture-best-practices-for-accessibility-and-css.json b/curriculum/structure/blocks/lecture-best-practices-for-accessibility-and-css.json
index ffa9a8d1314..afc533845cd 100644
--- a/curriculum/structure/blocks/lecture-best-practices-for-accessibility-and-css.json
+++ b/curriculum/structure/blocks/lecture-best-practices-for-accessibility-and-css.json
@@ -1,6 +1,6 @@
 {
   "name": "Best Practices for Accessibility and CSS",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-best-practices-for-accessibility-and-css",
diff --git a/curriculum/structure/blocks/lecture-best-practices-for-responsive-web-design.json b/curriculum/structure/blocks/lecture-best-practices-for-responsive-web-design.json
index 0bff99afebc..644f1b5ef40 100644
--- a/curriculum/structure/blocks/lecture-best-practices-for-responsive-web-design.json
+++ b/curriculum/structure/blocks/lecture-best-practices-for-responsive-web-design.json
@@ -1,6 +1,6 @@
 {
   "name": "Best Practices for Responsive Web Design",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-best-practices-for-responsive-web-design",
diff --git a/curriculum/structure/blocks/lecture-best-practices-for-styling-forms.json b/curriculum/structure/blocks/lecture-best-practices-for-styling-forms.json
index dcefc0f46a4..5bc6058760e 100644
--- a/curriculum/structure/blocks/lecture-best-practices-for-styling-forms.json
+++ b/curriculum/structure/blocks/lecture-best-practices-for-styling-forms.json
@@ -1,6 +1,6 @@
 {
   "name": "Best Practices for Styling Forms",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-best-practices-for-styling-forms",
diff --git a/curriculum/structure/blocks/lecture-browsing-the-web-effectively.json b/curriculum/structure/blocks/lecture-browsing-the-web-effectively.json
index f99404ff520..38ab31c95a3 100644
--- a/curriculum/structure/blocks/lecture-browsing-the-web-effectively.json
+++ b/curriculum/structure/blocks/lecture-browsing-the-web-effectively.json
@@ -1,6 +1,6 @@
 {
   "name": "Browsing the Web Effectively",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-browsing-the-web-effectively",
diff --git a/curriculum/structure/blocks/lecture-classes-and-objects.json b/curriculum/structure/blocks/lecture-classes-and-objects.json
index 1325a86b82f..21e57653950 100644
--- a/curriculum/structure/blocks/lecture-classes-and-objects.json
+++ b/curriculum/structure/blocks/lecture-classes-and-objects.json
@@ -2,7 +2,7 @@
   "name": "Classes and Objects",
   "isUpcomingChange": true,
   "dashedName": "lecture-classes-and-objects",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lecture-common-design-tools.json b/curriculum/structure/blocks/lecture-common-design-tools.json
index 59e85f4f68e..1f798b3905a 100644
--- a/curriculum/structure/blocks/lecture-common-design-tools.json
+++ b/curriculum/structure/blocks/lecture-common-design-tools.json
@@ -1,6 +1,6 @@
 {
   "name": "Common Design Tools",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-common-design-tools",
diff --git a/curriculum/structure/blocks/lecture-css-specificity-the-cascade-algorithm-and-inheritance.json b/curriculum/structure/blocks/lecture-css-specificity-the-cascade-algorithm-and-inheritance.json
index c544afa56bb..3fbbc4e5abf 100644
--- a/curriculum/structure/blocks/lecture-css-specificity-the-cascade-algorithm-and-inheritance.json
+++ b/curriculum/structure/blocks/lecture-css-specificity-the-cascade-algorithm-and-inheritance.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Specificity, the Cascade Algorithm, and Inheritance",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-css-specificity-the-cascade-algorithm-and-inheritance",
diff --git a/curriculum/structure/blocks/lecture-debugging-css.json b/curriculum/structure/blocks/lecture-debugging-css.json
index 406398396c4..e7bcad66a8f 100644
--- a/curriculum/structure/blocks/lecture-debugging-css.json
+++ b/curriculum/structure/blocks/lecture-debugging-css.json
@@ -1,6 +1,6 @@
 {
   "name": "Debugging CSS",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-debugging-css",
diff --git a/curriculum/structure/blocks/lecture-debugging-techniques.json b/curriculum/structure/blocks/lecture-debugging-techniques.json
index 41902fe4ccd..33b13456fea 100644
--- a/curriculum/structure/blocks/lecture-debugging-techniques.json
+++ b/curriculum/structure/blocks/lecture-debugging-techniques.json
@@ -1,6 +1,6 @@
 {
   "name": "Debugging Techniques",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-debugging-techniques",
diff --git a/curriculum/structure/blocks/lecture-html-fundamentals.json b/curriculum/structure/blocks/lecture-html-fundamentals.json
index 3262e69287b..3120282c2b1 100644
--- a/curriculum/structure/blocks/lecture-html-fundamentals.json
+++ b/curriculum/structure/blocks/lecture-html-fundamentals.json
@@ -1,6 +1,6 @@
 {
   "name": "HTML Fundamentals",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-html-fundamentals",
diff --git a/curriculum/structure/blocks/lecture-importance-of-accessibility-and-good-html-structure.json b/curriculum/structure/blocks/lecture-importance-of-accessibility-and-good-html-structure.json
index 1007b95ca97..7cd94859507 100644
--- a/curriculum/structure/blocks/lecture-importance-of-accessibility-and-good-html-structure.json
+++ b/curriculum/structure/blocks/lecture-importance-of-accessibility-and-good-html-structure.json
@@ -1,6 +1,6 @@
 {
   "name": "Importance of Accessibility and Good HTML Structure",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-importance-of-accessibility-and-good-html-structure",
diff --git a/curriculum/structure/blocks/lecture-importance-of-semantic-html.json b/curriculum/structure/blocks/lecture-importance-of-semantic-html.json
index b61cd4687d4..3311db190a2 100644
--- a/curriculum/structure/blocks/lecture-importance-of-semantic-html.json
+++ b/curriculum/structure/blocks/lecture-importance-of-semantic-html.json
@@ -1,6 +1,6 @@
 {
   "name": "Importance of Semantic HTML",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-importance-of-semantic-html",
diff --git a/curriculum/structure/blocks/lecture-introduction-to-aria.json b/curriculum/structure/blocks/lecture-introduction-to-aria.json
index 1073472efdd..4b2c4f3087d 100644
--- a/curriculum/structure/blocks/lecture-introduction-to-aria.json
+++ b/curriculum/structure/blocks/lecture-introduction-to-aria.json
@@ -1,7 +1,7 @@
 {
   "name": "Introduction to ARIA",
   "isUpcomingChange": false,
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "dashedName": "lecture-introduction-to-aria",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lecture-introduction-to-git-and-github.json b/curriculum/structure/blocks/lecture-introduction-to-git-and-github.json
index 5b5a84f604d..9d71369fa6a 100644
--- a/curriculum/structure/blocks/lecture-introduction-to-git-and-github.json
+++ b/curriculum/structure/blocks/lecture-introduction-to-git-and-github.json
@@ -1,6 +1,6 @@
 {
   "name": "Introduction to Git and GitHub",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-introduction-to-git-and-github",
diff --git a/curriculum/structure/blocks/lecture-introduction-to-javascript-libraries-and-frameworks.json b/curriculum/structure/blocks/lecture-introduction-to-javascript-libraries-and-frameworks.json
index 87b2ede1d12..f518790df42 100644
--- a/curriculum/structure/blocks/lecture-introduction-to-javascript-libraries-and-frameworks.json
+++ b/curriculum/structure/blocks/lecture-introduction-to-javascript-libraries-and-frameworks.json
@@ -1,6 +1,6 @@
 {
   "name": "Introduction to JavaScript Libraries and Frameworks",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-introduction-to-javascript-libraries-and-frameworks",
diff --git a/curriculum/structure/blocks/lecture-introduction-to-javascript-objects-and-their-properties.json b/curriculum/structure/blocks/lecture-introduction-to-javascript-objects-and-their-properties.json
index 56523280f99..3b866900b0d 100644
--- a/curriculum/structure/blocks/lecture-introduction-to-javascript-objects-and-their-properties.json
+++ b/curriculum/structure/blocks/lecture-introduction-to-javascript-objects-and-their-properties.json
@@ -1,6 +1,6 @@
 {
   "name": "Introduction to JavaScript Objects and Their Properties",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-introduction-to-javascript-objects-and-their-properties",
diff --git a/curriculum/structure/blocks/lecture-introduction-to-javascript.json b/curriculum/structure/blocks/lecture-introduction-to-javascript.json
index 0109c4f4a10..774f49714a5 100644
--- a/curriculum/structure/blocks/lecture-introduction-to-javascript.json
+++ b/curriculum/structure/blocks/lecture-introduction-to-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Introduction to JavaScript",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-introduction-to-javascript",
diff --git a/curriculum/structure/blocks/lecture-introduction-to-python.json b/curriculum/structure/blocks/lecture-introduction-to-python.json
index dd5bc967477..526335ec663 100644
--- a/curriculum/structure/blocks/lecture-introduction-to-python.json
+++ b/curriculum/structure/blocks/lecture-introduction-to-python.json
@@ -1,6 +1,6 @@
 {
   "name": "Introduction to Python",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-introduction-to-python",
diff --git a/curriculum/structure/blocks/lecture-introduction-to-strings.json b/curriculum/structure/blocks/lecture-introduction-to-strings.json
index a46554980d2..f8e207eac08 100644
--- a/curriculum/structure/blocks/lecture-introduction-to-strings.json
+++ b/curriculum/structure/blocks/lecture-introduction-to-strings.json
@@ -1,7 +1,7 @@
 {
   "name": "Introduction to Strings",
   "isUpcomingChange": false,
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "dashedName": "lecture-introduction-to-strings",
   "helpCategory": "JavaScript",
diff --git a/curriculum/structure/blocks/lecture-introduction-to-typescript.json b/curriculum/structure/blocks/lecture-introduction-to-typescript.json
index bd75b7306c4..c1d0712e15e 100644
--- a/curriculum/structure/blocks/lecture-introduction-to-typescript.json
+++ b/curriculum/structure/blocks/lecture-introduction-to-typescript.json
@@ -1,6 +1,6 @@
 {
   "name": "Introduction to TypeScript",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": true,
   "dashedName": "lecture-introduction-to-typescript",
diff --git a/curriculum/structure/blocks/lecture-react-strategies-and-debugging.json b/curriculum/structure/blocks/lecture-react-strategies-and-debugging.json
index a74075ea101..b1d00768251 100644
--- a/curriculum/structure/blocks/lecture-react-strategies-and-debugging.json
+++ b/curriculum/structure/blocks/lecture-react-strategies-and-debugging.json
@@ -1,6 +1,6 @@
 {
   "name": "React Strategies and Debugging",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-react-strategies-and-debugging",
diff --git a/curriculum/structure/blocks/lecture-routing-react-frameworks-and-dependency-management-tools.json b/curriculum/structure/blocks/lecture-routing-react-frameworks-and-dependency-management-tools.json
index bb60bf10cae..83692e102ca 100644
--- a/curriculum/structure/blocks/lecture-routing-react-frameworks-and-dependency-management-tools.json
+++ b/curriculum/structure/blocks/lecture-routing-react-frameworks-and-dependency-management-tools.json
@@ -1,6 +1,6 @@
 {
   "name": "Routing, React Frameworks, and Dependency Management Tools",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-routing-react-frameworks-and-dependency-management-tools",
diff --git a/curriculum/structure/blocks/lecture-searching-and-sorting-algorithms.json b/curriculum/structure/blocks/lecture-searching-and-sorting-algorithms.json
index 0f727e1577b..8689d405ed0 100644
--- a/curriculum/structure/blocks/lecture-searching-and-sorting-algorithms.json
+++ b/curriculum/structure/blocks/lecture-searching-and-sorting-algorithms.json
@@ -2,7 +2,7 @@
   "name": "Searching and Sorting Algorithms",
   "isUpcomingChange": true,
   "dashedName": "lecture-searching-and-sorting-algorithms",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lecture-styling-lists-and-links.json b/curriculum/structure/blocks/lecture-styling-lists-and-links.json
index 0adc2488109..138613542e7 100644
--- a/curriculum/structure/blocks/lecture-styling-lists-and-links.json
+++ b/curriculum/structure/blocks/lecture-styling-lists-and-links.json
@@ -1,6 +1,6 @@
 {
   "name": "Styling Lists and Links",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-styling-lists-and-links",
diff --git a/curriculum/structure/blocks/lecture-the-var-keyword-and-hoisting.json b/curriculum/structure/blocks/lecture-the-var-keyword-and-hoisting.json
index b68d7c58276..666d74251a0 100644
--- a/curriculum/structure/blocks/lecture-the-var-keyword-and-hoisting.json
+++ b/curriculum/structure/blocks/lecture-the-var-keyword-and-hoisting.json
@@ -1,6 +1,6 @@
 {
   "name": "The var Keyword and Hoisting",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-the-var-keyword-and-hoisting",
diff --git a/curriculum/structure/blocks/lecture-understanding-abstraction.json b/curriculum/structure/blocks/lecture-understanding-abstraction.json
index c1dd3eb5370..b586dcc8b11 100644
--- a/curriculum/structure/blocks/lecture-understanding-abstraction.json
+++ b/curriculum/structure/blocks/lecture-understanding-abstraction.json
@@ -2,7 +2,7 @@
   "name": "Understanding Abstraction",
   "isUpcomingChange": true,
   "dashedName": "lecture-understanding-abstraction",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lecture-understanding-aria-expanded-aria-live-and-common-aria-states.json b/curriculum/structure/blocks/lecture-understanding-aria-expanded-aria-live-and-common-aria-states.json
index 981d0709fe6..ac9128e1ea4 100644
--- a/curriculum/structure/blocks/lecture-understanding-aria-expanded-aria-live-and-common-aria-states.json
+++ b/curriculum/structure/blocks/lecture-understanding-aria-expanded-aria-live-and-common-aria-states.json
@@ -1,7 +1,7 @@
 {
   "name": "Understanding aria-expanded, aria-live, and Common ARIA States",
   "isUpcomingChange": false,
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "dashedName": "lecture-understanding-aria-expanded-aria-live-and-common-aria-states",
   "helpCategory": "JavaScript",
diff --git a/curriculum/structure/blocks/lecture-understanding-asynchronous-programming.json b/curriculum/structure/blocks/lecture-understanding-asynchronous-programming.json
index 139b5313a8d..fc2e6716767 100644
--- a/curriculum/structure/blocks/lecture-understanding-asynchronous-programming.json
+++ b/curriculum/structure/blocks/lecture-understanding-asynchronous-programming.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Asynchronous Programming",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-asynchronous-programming",
diff --git a/curriculum/structure/blocks/lecture-understanding-bash-scripting.json b/curriculum/structure/blocks/lecture-understanding-bash-scripting.json
index d4984783132..d271395713a 100644
--- a/curriculum/structure/blocks/lecture-understanding-bash-scripting.json
+++ b/curriculum/structure/blocks/lecture-understanding-bash-scripting.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Bash Scripting",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-bash-scripting",
diff --git a/curriculum/structure/blocks/lecture-understanding-code-clarity.json b/curriculum/structure/blocks/lecture-understanding-code-clarity.json
index 4aa7d4b83f3..3d91e83ec8a 100644
--- a/curriculum/structure/blocks/lecture-understanding-code-clarity.json
+++ b/curriculum/structure/blocks/lecture-understanding-code-clarity.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Code Clarity",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-code-clarity",
diff --git a/curriculum/structure/blocks/lecture-understanding-comparisons-and-conditionals.json b/curriculum/structure/blocks/lecture-understanding-comparisons-and-conditionals.json
index c231314904b..2729174d3fd 100644
--- a/curriculum/structure/blocks/lecture-understanding-comparisons-and-conditionals.json
+++ b/curriculum/structure/blocks/lecture-understanding-comparisons-and-conditionals.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Comparisons and Conditionals",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-comparisons-and-conditionals",
diff --git a/curriculum/structure/blocks/lecture-understanding-computer-internet-and-tooling-basics.json b/curriculum/structure/blocks/lecture-understanding-computer-internet-and-tooling-basics.json
index db8a7fc930e..72617dbf9d7 100644
--- a/curriculum/structure/blocks/lecture-understanding-computer-internet-and-tooling-basics.json
+++ b/curriculum/structure/blocks/lecture-understanding-computer-internet-and-tooling-basics.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Computer, Internet, and Tooling Basics",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-computer-internet-and-tooling-basics",
diff --git a/curriculum/structure/blocks/lecture-understanding-dynamic-programming.json b/curriculum/structure/blocks/lecture-understanding-dynamic-programming.json
index 923ba928d33..a4969183eba 100644
--- a/curriculum/structure/blocks/lecture-understanding-dynamic-programming.json
+++ b/curriculum/structure/blocks/lecture-understanding-dynamic-programming.json
@@ -2,7 +2,7 @@
   "name": "Understanding Dynamic Programming",
   "isUpcomingChange": true,
   "dashedName": "lecture-understanding-dynamic-programming",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lecture-understanding-effects-and-referencing-values-in-react.json b/curriculum/structure/blocks/lecture-understanding-effects-and-referencing-values-in-react.json
index 47a39ea07ac..808b4701c7e 100644
--- a/curriculum/structure/blocks/lecture-understanding-effects-and-referencing-values-in-react.json
+++ b/curriculum/structure/blocks/lecture-understanding-effects-and-referencing-values-in-react.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Effects and Referencing Values in React",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-effects-and-referencing-values-in-react",
diff --git a/curriculum/structure/blocks/lecture-understanding-error-handling.json b/curriculum/structure/blocks/lecture-understanding-error-handling.json
index 4e026b4c98a..2a6a39531cd 100644
--- a/curriculum/structure/blocks/lecture-understanding-error-handling.json
+++ b/curriculum/structure/blocks/lecture-understanding-error-handling.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Error Handling",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-error-handling",
diff --git a/curriculum/structure/blocks/lecture-understanding-form-validation.json b/curriculum/structure/blocks/lecture-understanding-form-validation.json
index a4451d15a7d..2111c1059bc 100644
--- a/curriculum/structure/blocks/lecture-understanding-form-validation.json
+++ b/curriculum/structure/blocks/lecture-understanding-form-validation.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Form Validation",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-form-validation",
diff --git a/curriculum/structure/blocks/lecture-understanding-functional-programming.json b/curriculum/structure/blocks/lecture-understanding-functional-programming.json
index 95411f04b47..b47c729946a 100644
--- a/curriculum/structure/blocks/lecture-understanding-functional-programming.json
+++ b/curriculum/structure/blocks/lecture-understanding-functional-programming.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Functional Programming",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-functional-programming",
diff --git a/curriculum/structure/blocks/lecture-understanding-graphs-and-trees.json b/curriculum/structure/blocks/lecture-understanding-graphs-and-trees.json
index c972f373a10..804228863f6 100644
--- a/curriculum/structure/blocks/lecture-understanding-graphs-and-trees.json
+++ b/curriculum/structure/blocks/lecture-understanding-graphs-and-trees.json
@@ -25,6 +25,6 @@
     }
   ],
   "helpCategory": "Python",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list"
 }
diff --git a/curriculum/structure/blocks/lecture-understanding-how-html-affects-seo.json b/curriculum/structure/blocks/lecture-understanding-how-html-affects-seo.json
index a0a53c4e78a..8f103e56f62 100644
--- a/curriculum/structure/blocks/lecture-understanding-how-html-affects-seo.json
+++ b/curriculum/structure/blocks/lecture-understanding-how-html-affects-seo.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding How HTML Affects SEO",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-how-html-affects-seo",
diff --git a/curriculum/structure/blocks/lecture-understanding-how-to-work-with-classes-in-javascript.json b/curriculum/structure/blocks/lecture-understanding-how-to-work-with-classes-in-javascript.json
index 4bf089d6a3b..61a2bd01211 100644
--- a/curriculum/structure/blocks/lecture-understanding-how-to-work-with-classes-in-javascript.json
+++ b/curriculum/structure/blocks/lecture-understanding-how-to-work-with-classes-in-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding How to Work with Classes in JavaScript",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-how-to-work-with-classes-in-javascript",
diff --git a/curriculum/structure/blocks/lecture-understanding-how-to-work-with-floats-and-positioning-in-css.json b/curriculum/structure/blocks/lecture-understanding-how-to-work-with-floats-and-positioning-in-css.json
index 1d004ee2e41..3a9d1b86622 100644
--- a/curriculum/structure/blocks/lecture-understanding-how-to-work-with-floats-and-positioning-in-css.json
+++ b/curriculum/structure/blocks/lecture-understanding-how-to-work-with-floats-and-positioning-in-css.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding How to Work with Floats and Positioning in CSS",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-how-to-work-with-floats-and-positioning-in-css",
diff --git a/curriculum/structure/blocks/lecture-understanding-html-attributes.json b/curriculum/structure/blocks/lecture-understanding-html-attributes.json
index 0bb5edef653..991a3f3e3aa 100644
--- a/curriculum/structure/blocks/lecture-understanding-html-attributes.json
+++ b/curriculum/structure/blocks/lecture-understanding-html-attributes.json
@@ -13,6 +13,6 @@
     }
   ],
   "helpCategory": "HTML-CSS",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list"
 }
diff --git a/curriculum/structure/blocks/lecture-understanding-inheritance-and-polymorphism.json b/curriculum/structure/blocks/lecture-understanding-inheritance-and-polymorphism.json
index 48a9f9e0983..e13318be6fd 100644
--- a/curriculum/structure/blocks/lecture-understanding-inheritance-and-polymorphism.json
+++ b/curriculum/structure/blocks/lecture-understanding-inheritance-and-polymorphism.json
@@ -2,7 +2,7 @@
   "name": "Understanding Inheritance and Polymorphism",
   "isUpcomingChange": true,
   "dashedName": "lecture-understanding-inheritance-and-polymorphism",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lecture-understanding-modules-imports-and-exports.json b/curriculum/structure/blocks/lecture-understanding-modules-imports-and-exports.json
index 9d24454e27c..a655ec2b0f5 100644
--- a/curriculum/structure/blocks/lecture-understanding-modules-imports-and-exports.json
+++ b/curriculum/structure/blocks/lecture-understanding-modules-imports-and-exports.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Modules, Imports, and Exports",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-modules-imports-and-exports",
diff --git a/curriculum/structure/blocks/lecture-understanding-nuanced-semantic-elements.json b/curriculum/structure/blocks/lecture-understanding-nuanced-semantic-elements.json
index de9d6544631..fe9df8239b8 100644
--- a/curriculum/structure/blocks/lecture-understanding-nuanced-semantic-elements.json
+++ b/curriculum/structure/blocks/lecture-understanding-nuanced-semantic-elements.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Nuanced Semantic Elements",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-nuanced-semantic-elements",
diff --git a/curriculum/structure/blocks/lecture-understanding-object-oriented-programming-and-encapsulation.json b/curriculum/structure/blocks/lecture-understanding-object-oriented-programming-and-encapsulation.json
index 8a5cd64f41e..df3ddcabc0f 100644
--- a/curriculum/structure/blocks/lecture-understanding-object-oriented-programming-and-encapsulation.json
+++ b/curriculum/structure/blocks/lecture-understanding-object-oriented-programming-and-encapsulation.json
@@ -2,7 +2,7 @@
   "name": "Understanding Object Oriented Programming and Encapsulation",
   "isUpcomingChange": true,
   "dashedName": "lecture-understanding-object-oriented-programming-and-encapsulation",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lecture-understanding-performance-in-web-applications.json b/curriculum/structure/blocks/lecture-understanding-performance-in-web-applications.json
index ce9165f8957..22ad9e7c0e9 100644
--- a/curriculum/structure/blocks/lecture-understanding-performance-in-web-applications.json
+++ b/curriculum/structure/blocks/lecture-understanding-performance-in-web-applications.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Performance in Web Applications",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-performance-in-web-applications",
diff --git a/curriculum/structure/blocks/lecture-understanding-recursion-and-the-call-stack.json b/curriculum/structure/blocks/lecture-understanding-recursion-and-the-call-stack.json
index ef9d881aa75..e57c5b9b17a 100644
--- a/curriculum/structure/blocks/lecture-understanding-recursion-and-the-call-stack.json
+++ b/curriculum/structure/blocks/lecture-understanding-recursion-and-the-call-stack.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding Recursion and the Call Stack",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-recursion-and-the-call-stack",
diff --git a/curriculum/structure/blocks/lecture-understanding-the-command-line-and-working-with-bash.json b/curriculum/structure/blocks/lecture-understanding-the-command-line-and-working-with-bash.json
index 602f3a34191..973a4aeefb0 100644
--- a/curriculum/structure/blocks/lecture-understanding-the-command-line-and-working-with-bash.json
+++ b/curriculum/structure/blocks/lecture-understanding-the-command-line-and-working-with-bash.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding the Command Line and Working with Bash",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-the-command-line-and-working-with-bash",
diff --git a/curriculum/structure/blocks/lecture-understanding-the-different-types-of-testing.json b/curriculum/structure/blocks/lecture-understanding-the-different-types-of-testing.json
index 4db4a4a71c4..0b126e21039 100644
--- a/curriculum/structure/blocks/lecture-understanding-the-different-types-of-testing.json
+++ b/curriculum/structure/blocks/lecture-understanding-the-different-types-of-testing.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding the Different Types of Testing",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-the-different-types-of-testing",
diff --git a/curriculum/structure/blocks/lecture-understanding-the-event-object-and-event-delegation.json b/curriculum/structure/blocks/lecture-understanding-the-event-object-and-event-delegation.json
index a09c4c2aa21..72dc2378440 100644
--- a/curriculum/structure/blocks/lecture-understanding-the-event-object-and-event-delegation.json
+++ b/curriculum/structure/blocks/lecture-understanding-the-event-object-and-event-delegation.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding the Event Object and Event Delegation",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-the-event-object-and-event-delegation",
diff --git a/curriculum/structure/blocks/lecture-understanding-the-html-boilerplate.json b/curriculum/structure/blocks/lecture-understanding-the-html-boilerplate.json
index ca0afff3e97..24267cb5e8f 100644
--- a/curriculum/structure/blocks/lecture-understanding-the-html-boilerplate.json
+++ b/curriculum/structure/blocks/lecture-understanding-the-html-boilerplate.json
@@ -1,6 +1,6 @@
 {
   "name": "Understanding the HTML Boilerplate",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-understanding-the-html-boilerplate",
diff --git a/curriculum/structure/blocks/lecture-understanding-the-http-request-response-model.json b/curriculum/structure/blocks/lecture-understanding-the-http-request-response-model.json
index 6fe2cae0ec4..a91dccbfdce 100644
--- a/curriculum/structure/blocks/lecture-understanding-the-http-request-response-model.json
+++ b/curriculum/structure/blocks/lecture-understanding-the-http-request-response-model.json
@@ -18,5 +18,5 @@
       "title": "What Happens When a Form Is Submitted and How Do the Different Form Submissions Work?"
     }
   ],
-  "blockType": "lecture"
+  "blockLabel": "lecture"
 }
diff --git a/curriculum/structure/blocks/lecture-user-centered-design.json b/curriculum/structure/blocks/lecture-user-centered-design.json
index 26465050c54..fda2ac7b2cc 100644
--- a/curriculum/structure/blocks/lecture-user-centered-design.json
+++ b/curriculum/structure/blocks/lecture-user-centered-design.json
@@ -1,6 +1,6 @@
 {
   "name": "User-Centered Design",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-user-centered-design",
diff --git a/curriculum/structure/blocks/lecture-user-interface-design-fundamentals.json b/curriculum/structure/blocks/lecture-user-interface-design-fundamentals.json
index f96977d78f2..50268deed04 100644
--- a/curriculum/structure/blocks/lecture-user-interface-design-fundamentals.json
+++ b/curriculum/structure/blocks/lecture-user-interface-design-fundamentals.json
@@ -1,6 +1,6 @@
 {
   "name": "User Interface Design Fundamentals",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-user-interface-design-fundamentals",
diff --git a/curriculum/structure/blocks/lecture-what-is-css.json b/curriculum/structure/blocks/lecture-what-is-css.json
index 973704ab83b..9f43a5f8d09 100644
--- a/curriculum/structure/blocks/lecture-what-is-css.json
+++ b/curriculum/structure/blocks/lecture-what-is-css.json
@@ -1,6 +1,6 @@
 {
   "name": "What Is CSS?",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-what-is-css",
diff --git a/curriculum/structure/blocks/lecture-working-with-arrays-variables-and-naming-practices.json b/curriculum/structure/blocks/lecture-working-with-arrays-variables-and-naming-practices.json
index c2f29e5d2e5..e4af2cd51f5 100644
--- a/curriculum/structure/blocks/lecture-working-with-arrays-variables-and-naming-practices.json
+++ b/curriculum/structure/blocks/lecture-working-with-arrays-variables-and-naming-practices.json
@@ -2,7 +2,7 @@
   "name": "Working with Arrays, Variables, and Naming Practices",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-arrays-variables-and-naming-practices",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "helpCategory": "JavaScript",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lecture-working-with-arrays.json b/curriculum/structure/blocks/lecture-working-with-arrays.json
index 64a4814f4cf..8b623e49b0f 100644
--- a/curriculum/structure/blocks/lecture-working-with-arrays.json
+++ b/curriculum/structure/blocks/lecture-working-with-arrays.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Arrays",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-arrays",
diff --git a/curriculum/structure/blocks/lecture-working-with-attribute-selectors.json b/curriculum/structure/blocks/lecture-working-with-attribute-selectors.json
index 312ef0d4078..1f77bd66663 100644
--- a/curriculum/structure/blocks/lecture-working-with-attribute-selectors.json
+++ b/curriculum/structure/blocks/lecture-working-with-attribute-selectors.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Attribute Selectors",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-attribute-selectors",
diff --git a/curriculum/structure/blocks/lecture-working-with-audio-and-video-elements.json b/curriculum/structure/blocks/lecture-working-with-audio-and-video-elements.json
index 0e54c531d16..7c6ba9c3777 100644
--- a/curriculum/structure/blocks/lecture-working-with-audio-and-video-elements.json
+++ b/curriculum/structure/blocks/lecture-working-with-audio-and-video-elements.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Audio and Video Elements",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-audio-and-video-elements",
diff --git a/curriculum/structure/blocks/lecture-working-with-audio-and-video.json b/curriculum/structure/blocks/lecture-working-with-audio-and-video.json
index 30ef2820348..248d6cfcc9b 100644
--- a/curriculum/structure/blocks/lecture-working-with-audio-and-video.json
+++ b/curriculum/structure/blocks/lecture-working-with-audio-and-video.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Audio and Video",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-audio-and-video",
diff --git a/curriculum/structure/blocks/lecture-working-with-backgrounds-and-borders.json b/curriculum/structure/blocks/lecture-working-with-backgrounds-and-borders.json
index ff8f79c7b6a..8d18c96ff95 100644
--- a/curriculum/structure/blocks/lecture-working-with-backgrounds-and-borders.json
+++ b/curriculum/structure/blocks/lecture-working-with-backgrounds-and-borders.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Backgrounds and Borders",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-backgrounds-and-borders",
diff --git a/curriculum/structure/blocks/lecture-working-with-client-side-storage-and-crud-operations.json b/curriculum/structure/blocks/lecture-working-with-client-side-storage-and-crud-operations.json
index 599a4bfb560..70f7919c24e 100644
--- a/curriculum/structure/blocks/lecture-working-with-client-side-storage-and-crud-operations.json
+++ b/curriculum/structure/blocks/lecture-working-with-client-side-storage-and-crud-operations.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Client-Side Storage and CRUD Operations",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-client-side-storage-and-crud-operations",
diff --git a/curriculum/structure/blocks/lecture-working-with-code-editors-and-ides.json b/curriculum/structure/blocks/lecture-working-with-code-editors-and-ides.json
index f695a2fcf74..0b093195b8a 100644
--- a/curriculum/structure/blocks/lecture-working-with-code-editors-and-ides.json
+++ b/curriculum/structure/blocks/lecture-working-with-code-editors-and-ides.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Code Editors and IDEs",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-code-editors-and-ides",
diff --git a/curriculum/structure/blocks/lecture-working-with-code-quality-and-execution-concepts.json b/curriculum/structure/blocks/lecture-working-with-code-quality-and-execution-concepts.json
index cf39ef58aa5..74ca0485a0e 100644
--- a/curriculum/structure/blocks/lecture-working-with-code-quality-and-execution-concepts.json
+++ b/curriculum/structure/blocks/lecture-working-with-code-quality-and-execution-concepts.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Code Quality and Execution Concepts",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "dashedName": "lecture-working-with-code-quality-and-execution-concepts",
   "helpCategory": "JavaScript",
diff --git a/curriculum/structure/blocks/lecture-working-with-code-reviews-branching-deployment-and-ci-cd.json b/curriculum/structure/blocks/lecture-working-with-code-reviews-branching-deployment-and-ci-cd.json
index c8921dd8187..b3e957b280d 100644
--- a/curriculum/structure/blocks/lecture-working-with-code-reviews-branching-deployment-and-ci-cd.json
+++ b/curriculum/structure/blocks/lecture-working-with-code-reviews-branching-deployment-and-ci-cd.json
@@ -1,6 +1,6 @@
 {
   "name": "Working With Code Reviews, Branching, Deployment, and CI/CD",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-code-reviews-branching-deployment-and-ci-cd",
diff --git a/curriculum/structure/blocks/lecture-working-with-colors-in-css.json b/curriculum/structure/blocks/lecture-working-with-colors-in-css.json
index ec192726ee6..1c59a643b76 100644
--- a/curriculum/structure/blocks/lecture-working-with-colors-in-css.json
+++ b/curriculum/structure/blocks/lecture-working-with-colors-in-css.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Colors in CSS",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-colors-in-css",
diff --git a/curriculum/structure/blocks/lecture-working-with-common-array-methods.json b/curriculum/structure/blocks/lecture-working-with-common-array-methods.json
index b5cde1ebeaa..aba57f89bc8 100644
--- a/curriculum/structure/blocks/lecture-working-with-common-array-methods.json
+++ b/curriculum/structure/blocks/lecture-working-with-common-array-methods.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Common Array Methods",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-common-array-methods",
diff --git a/curriculum/structure/blocks/lecture-working-with-common-data-structures.json b/curriculum/structure/blocks/lecture-working-with-common-data-structures.json
index ccafeee1c95..fffdcba68df 100644
--- a/curriculum/structure/blocks/lecture-working-with-common-data-structures.json
+++ b/curriculum/structure/blocks/lecture-working-with-common-data-structures.json
@@ -2,7 +2,7 @@
   "name": "Working with Common Data Structures",
   "isUpcomingChange": true,
   "dashedName": "lecture-working-with-common-data-structures",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lecture-working-with-comparison-and-boolean-operators.json b/curriculum/structure/blocks/lecture-working-with-comparison-and-boolean-operators.json
index 48df7e46222..d933274478a 100644
--- a/curriculum/structure/blocks/lecture-working-with-comparison-and-boolean-operators.json
+++ b/curriculum/structure/blocks/lecture-working-with-comparison-and-boolean-operators.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Comparison and Boolean Operators",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-comparison-and-boolean-operators",
diff --git a/curriculum/structure/blocks/lecture-working-with-conditional-logic-and-math-methods.json b/curriculum/structure/blocks/lecture-working-with-conditional-logic-and-math-methods.json
index 08e228a0dcc..11a4c15a734 100644
--- a/curriculum/structure/blocks/lecture-working-with-conditional-logic-and-math-methods.json
+++ b/curriculum/structure/blocks/lecture-working-with-conditional-logic-and-math-methods.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Conditional Logic and Math Methods",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-conditional-logic-and-math-methods",
diff --git a/curriculum/structure/blocks/lecture-working-with-css-flexbox.json b/curriculum/structure/blocks/lecture-working-with-css-flexbox.json
index 3a9b6a43b0c..61f180082b5 100644
--- a/curriculum/structure/blocks/lecture-working-with-css-flexbox.json
+++ b/curriculum/structure/blocks/lecture-working-with-css-flexbox.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with CSS Flexbox",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-css-flexbox",
diff --git a/curriculum/structure/blocks/lecture-working-with-css-fonts.json b/curriculum/structure/blocks/lecture-working-with-css-fonts.json
index d7c92f8168f..0df1613d710 100644
--- a/curriculum/structure/blocks/lecture-working-with-css-fonts.json
+++ b/curriculum/structure/blocks/lecture-working-with-css-fonts.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with CSS Fonts",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-css-fonts",
diff --git a/curriculum/structure/blocks/lecture-working-with-css-grid.json b/curriculum/structure/blocks/lecture-working-with-css-grid.json
index 821500fce26..16daf1adbb4 100644
--- a/curriculum/structure/blocks/lecture-working-with-css-grid.json
+++ b/curriculum/structure/blocks/lecture-working-with-css-grid.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with CSS Grid",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-css-grid",
diff --git a/curriculum/structure/blocks/lecture-working-with-css-libraries-and-frameworks.json b/curriculum/structure/blocks/lecture-working-with-css-libraries-and-frameworks.json
index ccbef55bcf1..f0173a77529 100644
--- a/curriculum/structure/blocks/lecture-working-with-css-libraries-and-frameworks.json
+++ b/curriculum/structure/blocks/lecture-working-with-css-libraries-and-frameworks.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with CSS Libraries and Frameworks",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-css-libraries-and-frameworks",
diff --git a/curriculum/structure/blocks/lecture-working-with-css-transforms-overflow-and-filters.json b/curriculum/structure/blocks/lecture-working-with-css-transforms-overflow-and-filters.json
index a66ea9ede6e..6cbaf2eeebc 100644
--- a/curriculum/structure/blocks/lecture-working-with-css-transforms-overflow-and-filters.json
+++ b/curriculum/structure/blocks/lecture-working-with-css-transforms-overflow-and-filters.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with CSS Transforms, Overflow, and Filters",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-css-transforms-overflow-and-filters",
diff --git a/curriculum/structure/blocks/lecture-working-with-css-variables.json b/curriculum/structure/blocks/lecture-working-with-css-variables.json
index c2aeb858518..7f31bf246d7 100644
--- a/curriculum/structure/blocks/lecture-working-with-css-variables.json
+++ b/curriculum/structure/blocks/lecture-working-with-css-variables.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with CSS Variables",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-css-variables",
diff --git a/curriculum/structure/blocks/lecture-working-with-data-fetching-and-memoization-in-react.json b/curriculum/structure/blocks/lecture-working-with-data-fetching-and-memoization-in-react.json
index 80de6f4c758..03c7691f6b5 100644
--- a/curriculum/structure/blocks/lecture-working-with-data-fetching-and-memoization-in-react.json
+++ b/curriculum/structure/blocks/lecture-working-with-data-fetching-and-memoization-in-react.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Data Fetching and Memoization in React",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-data-fetching-and-memoization-in-react",
diff --git a/curriculum/structure/blocks/lecture-working-with-data-in-react.json b/curriculum/structure/blocks/lecture-working-with-data-in-react.json
index 6dc9282cd08..a79df287a6c 100644
--- a/curriculum/structure/blocks/lecture-working-with-data-in-react.json
+++ b/curriculum/structure/blocks/lecture-working-with-data-in-react.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Data in React",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-data-in-react",
diff --git a/curriculum/structure/blocks/lecture-working-with-data-types.json b/curriculum/structure/blocks/lecture-working-with-data-types.json
index e1f2b724fe4..3cadf15ae3c 100644
--- a/curriculum/structure/blocks/lecture-working-with-data-types.json
+++ b/curriculum/structure/blocks/lecture-working-with-data-types.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Data Types",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-data-types",
diff --git a/curriculum/structure/blocks/lecture-working-with-dates.json b/curriculum/structure/blocks/lecture-working-with-dates.json
index f473643fff2..5254a4d2f1e 100644
--- a/curriculum/structure/blocks/lecture-working-with-dates.json
+++ b/curriculum/structure/blocks/lecture-working-with-dates.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Dates",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-dates",
diff --git a/curriculum/structure/blocks/lecture-working-with-dictionaries-and-sets.json b/curriculum/structure/blocks/lecture-working-with-dictionaries-and-sets.json
index 6409e3dd215..97da42e37da 100644
--- a/curriculum/structure/blocks/lecture-working-with-dictionaries-and-sets.json
+++ b/curriculum/structure/blocks/lecture-working-with-dictionaries-and-sets.json
@@ -2,7 +2,7 @@
   "name": "Working with Dictionaries and Sets",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-dictionaries-and-sets",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lecture-working-with-file-systems.json b/curriculum/structure/blocks/lecture-working-with-file-systems.json
index b07f7042c2e..7f72348d3d8 100644
--- a/curriculum/structure/blocks/lecture-working-with-file-systems.json
+++ b/curriculum/structure/blocks/lecture-working-with-file-systems.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with File Systems",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-file-systems",
diff --git a/curriculum/structure/blocks/lecture-working-with-forms-in-react.json b/curriculum/structure/blocks/lecture-working-with-forms-in-react.json
index e87418896d1..08c9efe4734 100644
--- a/curriculum/structure/blocks/lecture-working-with-forms-in-react.json
+++ b/curriculum/structure/blocks/lecture-working-with-forms-in-react.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Forms in React",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-forms-in-react",
diff --git a/curriculum/structure/blocks/lecture-working-with-forms.json b/curriculum/structure/blocks/lecture-working-with-forms.json
index 2be5f8595b6..15fee9d258a 100644
--- a/curriculum/structure/blocks/lecture-working-with-forms.json
+++ b/curriculum/structure/blocks/lecture-working-with-forms.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Forms",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-forms",
diff --git a/curriculum/structure/blocks/lecture-working-with-functions.json b/curriculum/structure/blocks/lecture-working-with-functions.json
index 18b8045e612..8e747b739c2 100644
--- a/curriculum/structure/blocks/lecture-working-with-functions.json
+++ b/curriculum/structure/blocks/lecture-working-with-functions.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Functions",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-functions",
diff --git a/curriculum/structure/blocks/lecture-working-with-generics-and-type-narrowing.json b/curriculum/structure/blocks/lecture-working-with-generics-and-type-narrowing.json
index da26f957c32..2b6eb960203 100644
--- a/curriculum/structure/blocks/lecture-working-with-generics-and-type-narrowing.json
+++ b/curriculum/structure/blocks/lecture-working-with-generics-and-type-narrowing.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Generics and Type Narrowing",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": true,
   "dashedName": "lecture-working-with-generics-and-type-narrowing",
diff --git a/curriculum/structure/blocks/lecture-working-with-higher-order-functions-and-callbacks.json b/curriculum/structure/blocks/lecture-working-with-higher-order-functions-and-callbacks.json
index 1072836549c..efe601f11d6 100644
--- a/curriculum/structure/blocks/lecture-working-with-higher-order-functions-and-callbacks.json
+++ b/curriculum/structure/blocks/lecture-working-with-higher-order-functions-and-callbacks.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Higher Order Functions and Callbacks",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-higher-order-functions-and-callbacks",
diff --git a/curriculum/structure/blocks/lecture-working-with-html-tools.json b/curriculum/structure/blocks/lecture-working-with-html-tools.json
index 3e4a6abd95f..2b53f2acf21 100644
--- a/curriculum/structure/blocks/lecture-working-with-html-tools.json
+++ b/curriculum/structure/blocks/lecture-working-with-html-tools.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with HTML Tools",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-html-tools",
diff --git a/curriculum/structure/blocks/lecture-working-with-images-and-svgs.json b/curriculum/structure/blocks/lecture-working-with-images-and-svgs.json
index 7d2ef419f5e..a10e1bcf76c 100644
--- a/curriculum/structure/blocks/lecture-working-with-images-and-svgs.json
+++ b/curriculum/structure/blocks/lecture-working-with-images-and-svgs.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Images and SVGs",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-images-and-svgs",
diff --git a/curriculum/structure/blocks/lecture-working-with-json.json b/curriculum/structure/blocks/lecture-working-with-json.json
index 136f0769cfa..d813806ee52 100644
--- a/curriculum/structure/blocks/lecture-working-with-json.json
+++ b/curriculum/structure/blocks/lecture-working-with-json.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with JSON",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-json",
diff --git a/curriculum/structure/blocks/lecture-working-with-links.json b/curriculum/structure/blocks/lecture-working-with-links.json
index b3bccc884c4..9740537491c 100644
--- a/curriculum/structure/blocks/lecture-working-with-links.json
+++ b/curriculum/structure/blocks/lecture-working-with-links.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Links",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-links",
diff --git a/curriculum/structure/blocks/lecture-working-with-loops-and-sequences.json b/curriculum/structure/blocks/lecture-working-with-loops-and-sequences.json
index e36110fd85e..704b3baa011 100644
--- a/curriculum/structure/blocks/lecture-working-with-loops-and-sequences.json
+++ b/curriculum/structure/blocks/lecture-working-with-loops-and-sequences.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Loops and Sequences",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-loops-and-sequences",
diff --git a/curriculum/structure/blocks/lecture-working-with-loops.json b/curriculum/structure/blocks/lecture-working-with-loops.json
index e9dffb4234f..bde848336ce 100644
--- a/curriculum/structure/blocks/lecture-working-with-loops.json
+++ b/curriculum/structure/blocks/lecture-working-with-loops.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Loops",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-loops",
diff --git a/curriculum/structure/blocks/lecture-working-with-maps-and-sets.json b/curriculum/structure/blocks/lecture-working-with-maps-and-sets.json
index a950edaf7ac..97bade65cbc 100644
--- a/curriculum/structure/blocks/lecture-working-with-maps-and-sets.json
+++ b/curriculum/structure/blocks/lecture-working-with-maps-and-sets.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Maps and Sets",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-maps-and-sets",
diff --git a/curriculum/structure/blocks/lecture-working-with-media.json b/curriculum/structure/blocks/lecture-working-with-media.json
index cd0cedda722..4355cd6cd61 100644
--- a/curriculum/structure/blocks/lecture-working-with-media.json
+++ b/curriculum/structure/blocks/lecture-working-with-media.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with the iframe Element",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-media",
diff --git a/curriculum/structure/blocks/lecture-working-with-modules.json b/curriculum/structure/blocks/lecture-working-with-modules.json
index 38e88ec339c..2d225ef8636 100644
--- a/curriculum/structure/blocks/lecture-working-with-modules.json
+++ b/curriculum/structure/blocks/lecture-working-with-modules.json
@@ -2,7 +2,7 @@
   "name": "Working with Modules",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-modules",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/lecture-working-with-nano.json b/curriculum/structure/blocks/lecture-working-with-nano.json
index 60711603e1e..527f8f6a1a6 100644
--- a/curriculum/structure/blocks/lecture-working-with-nano.json
+++ b/curriculum/structure/blocks/lecture-working-with-nano.json
@@ -1,6 +1,6 @@
 {
   "name": "Working With Nano",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-nano",
diff --git a/curriculum/structure/blocks/lecture-working-with-numbers-and-arithmetic-operators.json b/curriculum/structure/blocks/lecture-working-with-numbers-and-arithmetic-operators.json
index a4dd53949af..84e8d191fa4 100644
--- a/curriculum/structure/blocks/lecture-working-with-numbers-and-arithmetic-operators.json
+++ b/curriculum/structure/blocks/lecture-working-with-numbers-and-arithmetic-operators.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Numbers and Arithmetic Operators",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-numbers-and-arithmetic-operators",
diff --git a/curriculum/structure/blocks/lecture-working-with-numbers-and-common-number-methods.json b/curriculum/structure/blocks/lecture-working-with-numbers-and-common-number-methods.json
index a96dcbe6d3a..efe0c2251bb 100644
--- a/curriculum/structure/blocks/lecture-working-with-numbers-and-common-number-methods.json
+++ b/curriculum/structure/blocks/lecture-working-with-numbers-and-common-number-methods.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Numbers and Common Number Methods",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-numbers-and-common-number-methods",
diff --git a/curriculum/structure/blocks/lecture-working-with-operator-behavior.json b/curriculum/structure/blocks/lecture-working-with-operator-behavior.json
index c7fcc505636..15b64ba48a4 100644
--- a/curriculum/structure/blocks/lecture-working-with-operator-behavior.json
+++ b/curriculum/structure/blocks/lecture-working-with-operator-behavior.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Operator Behavior",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-operator-behavior",
diff --git a/curriculum/structure/blocks/lecture-working-with-optional-chaining-and-object-destructuring.json b/curriculum/structure/blocks/lecture-working-with-optional-chaining-and-object-destructuring.json
index cf16bff28a4..0cbcb4719aa 100644
--- a/curriculum/structure/blocks/lecture-working-with-optional-chaining-and-object-destructuring.json
+++ b/curriculum/structure/blocks/lecture-working-with-optional-chaining-and-object-destructuring.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Optional Chaining and Object Destructuring",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-optional-chaining-and-object-destructuring",
diff --git a/curriculum/structure/blocks/lecture-working-with-pseudo-classes-and-pseudo-elements-in-css.json b/curriculum/structure/blocks/lecture-working-with-pseudo-classes-and-pseudo-elements-in-css.json
index 184989c09a9..babb4236f2f 100644
--- a/curriculum/structure/blocks/lecture-working-with-pseudo-classes-and-pseudo-elements-in-css.json
+++ b/curriculum/structure/blocks/lecture-working-with-pseudo-classes-and-pseudo-elements-in-css.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Pseudo-Classes and Pseudo-Elements in CSS",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-pseudo-classes-and-pseudo-elements-in-css",
diff --git a/curriculum/structure/blocks/lecture-working-with-regular-expressions.json b/curriculum/structure/blocks/lecture-working-with-regular-expressions.json
index 67c3be07e0d..25e3562ea32 100644
--- a/curriculum/structure/blocks/lecture-working-with-regular-expressions.json
+++ b/curriculum/structure/blocks/lecture-working-with-regular-expressions.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Regular Expressions",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-regular-expressions",
diff --git a/curriculum/structure/blocks/lecture-working-with-relational-databases.json b/curriculum/structure/blocks/lecture-working-with-relational-databases.json
index 9df32cc3ae9..736c9769a93 100644
--- a/curriculum/structure/blocks/lecture-working-with-relational-databases.json
+++ b/curriculum/structure/blocks/lecture-working-with-relational-databases.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Relational Databases",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-relational-databases",
diff --git a/curriculum/structure/blocks/lecture-working-with-relative-and-absolute-units.json b/curriculum/structure/blocks/lecture-working-with-relative-and-absolute-units.json
index f162ce7bdd6..a48c3b43e37 100644
--- a/curriculum/structure/blocks/lecture-working-with-relative-and-absolute-units.json
+++ b/curriculum/structure/blocks/lecture-working-with-relative-and-absolute-units.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Relative and Absolute Units",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-relative-and-absolute-units",
diff --git a/curriculum/structure/blocks/lecture-working-with-specialized-semantic-elements.json b/curriculum/structure/blocks/lecture-working-with-specialized-semantic-elements.json
index 44b59cd1996..a4a76cb0b33 100644
--- a/curriculum/structure/blocks/lecture-working-with-specialized-semantic-elements.json
+++ b/curriculum/structure/blocks/lecture-working-with-specialized-semantic-elements.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Specialized Semantic Elements",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-specialized-semantic-elements",
diff --git a/curriculum/structure/blocks/lecture-working-with-sql.json b/curriculum/structure/blocks/lecture-working-with-sql.json
index d04912f33f6..6b0ecaa9d3c 100644
--- a/curriculum/structure/blocks/lecture-working-with-sql.json
+++ b/curriculum/structure/blocks/lecture-working-with-sql.json
@@ -1,6 +1,6 @@
 {
   "name": "Working With SQL",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-sql",
diff --git a/curriculum/structure/blocks/lecture-working-with-state-and-responding-to-events-in-react.json b/curriculum/structure/blocks/lecture-working-with-state-and-responding-to-events-in-react.json
index f3c62c6033d..c8718dbc0bb 100644
--- a/curriculum/structure/blocks/lecture-working-with-state-and-responding-to-events-in-react.json
+++ b/curriculum/structure/blocks/lecture-working-with-state-and-responding-to-events-in-react.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with State and Responding to Events in React",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-state-and-responding-to-events-in-react",
diff --git a/curriculum/structure/blocks/lecture-working-with-string-character-methods.json b/curriculum/structure/blocks/lecture-working-with-string-character-methods.json
index 665f9c08150..db1855d2f2d 100644
--- a/curriculum/structure/blocks/lecture-working-with-string-character-methods.json
+++ b/curriculum/structure/blocks/lecture-working-with-string-character-methods.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with String Character Methods",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-string-character-methods",
diff --git a/curriculum/structure/blocks/lecture-working-with-string-formatting-methods.json b/curriculum/structure/blocks/lecture-working-with-string-formatting-methods.json
index 428411c5b7a..4bb80763754 100644
--- a/curriculum/structure/blocks/lecture-working-with-string-formatting-methods.json
+++ b/curriculum/structure/blocks/lecture-working-with-string-formatting-methods.json
@@ -2,7 +2,7 @@
   "name": "Working with String Formatting Methods",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-string-formatting-methods",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "helpCategory": "JavaScript",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/lecture-working-with-string-modification-methods.json b/curriculum/structure/blocks/lecture-working-with-string-modification-methods.json
index 0afc16c448b..9b60e2e9e27 100644
--- a/curriculum/structure/blocks/lecture-working-with-string-modification-methods.json
+++ b/curriculum/structure/blocks/lecture-working-with-string-modification-methods.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with String Modification Methods",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-string-modification-methods",
diff --git a/curriculum/structure/blocks/lecture-working-with-string-search-and-slice-methods.json b/curriculum/structure/blocks/lecture-working-with-string-search-and-slice-methods.json
index 8448353e5bd..7378db412f6 100644
--- a/curriculum/structure/blocks/lecture-working-with-string-search-and-slice-methods.json
+++ b/curriculum/structure/blocks/lecture-working-with-string-search-and-slice-methods.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with String Search and Slice Methods",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-string-search-and-slice-methods",
diff --git a/curriculum/structure/blocks/lecture-working-with-strings-in-javascript.json b/curriculum/structure/blocks/lecture-working-with-strings-in-javascript.json
index b00d9681e10..5579be196ca 100644
--- a/curriculum/structure/blocks/lecture-working-with-strings-in-javascript.json
+++ b/curriculum/structure/blocks/lecture-working-with-strings-in-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Strings in JavaScript",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-strings-in-javascript",
diff --git a/curriculum/structure/blocks/lecture-working-with-tables.json b/curriculum/structure/blocks/lecture-working-with-tables.json
index 74f624038b1..93c3f5cb883 100644
--- a/curriculum/structure/blocks/lecture-working-with-tables.json
+++ b/curriculum/structure/blocks/lecture-working-with-tables.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Tables",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-tables",
diff --git a/curriculum/structure/blocks/lecture-working-with-text-and-time-semantic-elements.json b/curriculum/structure/blocks/lecture-working-with-text-and-time-semantic-elements.json
index e3f8153f95d..afe242348a1 100644
--- a/curriculum/structure/blocks/lecture-working-with-text-and-time-semantic-elements.json
+++ b/curriculum/structure/blocks/lecture-working-with-text-and-time-semantic-elements.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Text and Time Semantic Elements ",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-text-and-time-semantic-elements",
diff --git a/curriculum/structure/blocks/lecture-working-with-the-arguments-object-and-rest-parameters.json b/curriculum/structure/blocks/lecture-working-with-the-arguments-object-and-rest-parameters.json
index 2c67c43183e..376228cd216 100644
--- a/curriculum/structure/blocks/lecture-working-with-the-arguments-object-and-rest-parameters.json
+++ b/curriculum/structure/blocks/lecture-working-with-the-arguments-object-and-rest-parameters.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with the arguments Object and Rest Parameters",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-the-arguments-object-and-rest-parameters",
diff --git a/curriculum/structure/blocks/lecture-working-with-the-dom-click-events-and-web-apis.json b/curriculum/structure/blocks/lecture-working-with-the-dom-click-events-and-web-apis.json
index 05b5a0567b8..62e8d7441ab 100644
--- a/curriculum/structure/blocks/lecture-working-with-the-dom-click-events-and-web-apis.json
+++ b/curriculum/structure/blocks/lecture-working-with-the-dom-click-events-and-web-apis.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with the DOM, Click Events, and Web APIs",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-the-dom-click-events-and-web-apis",
diff --git a/curriculum/structure/blocks/lecture-working-with-types-and-objects.json b/curriculum/structure/blocks/lecture-working-with-types-and-objects.json
index 28b7cfb588a..4143139be23 100644
--- a/curriculum/structure/blocks/lecture-working-with-types-and-objects.json
+++ b/curriculum/structure/blocks/lecture-working-with-types-and-objects.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Types and Objects",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-types-and-objects",
diff --git a/curriculum/structure/blocks/lecture-working-with-typescript-configuration-files.json b/curriculum/structure/blocks/lecture-working-with-typescript-configuration-files.json
index 61b0201b3b6..71a1eea1796 100644
--- a/curriculum/structure/blocks/lecture-working-with-typescript-configuration-files.json
+++ b/curriculum/structure/blocks/lecture-working-with-typescript-configuration-files.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with TypeScript Configuration Files",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": true,
   "dashedName": "lecture-working-with-typescript-configuration-files",
diff --git a/curriculum/structure/blocks/lecture-working-with-unary-and-bitwise-operators.json b/curriculum/structure/blocks/lecture-working-with-unary-and-bitwise-operators.json
index b548b7afc6a..a33f70c36fb 100644
--- a/curriculum/structure/blocks/lecture-working-with-unary-and-bitwise-operators.json
+++ b/curriculum/structure/blocks/lecture-working-with-unary-and-bitwise-operators.json
@@ -1,6 +1,6 @@
 {
   "name": "Working with Unary and Bitwise Operators",
-  "blockType": "lecture",
+  "blockLabel": "lecture",
   "blockLayout": "challenge-list",
   "isUpcomingChange": false,
   "dashedName": "lecture-working-with-unary-and-bitwise-operators",
diff --git a/curriculum/structure/blocks/quiz-asynchronous-javascript.json b/curriculum/structure/blocks/quiz-asynchronous-javascript.json
index 95ed49aaa35..c50ca6f8739 100644
--- a/curriculum/structure/blocks/quiz-asynchronous-javascript.json
+++ b/curriculum/structure/blocks/quiz-asynchronous-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Asynchronous JavaScript Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-asynchronous-javascript",
diff --git a/curriculum/structure/blocks/quiz-bash-and-sql.json b/curriculum/structure/blocks/quiz-bash-and-sql.json
index 3c6f078b4e0..0b8f65d8360 100644
--- a/curriculum/structure/blocks/quiz-bash-and-sql.json
+++ b/curriculum/structure/blocks/quiz-bash-and-sql.json
@@ -1,6 +1,6 @@
 {
   "name": "Bash and SQL Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-bash-and-sql",
diff --git a/curriculum/structure/blocks/quiz-bash-commands.json b/curriculum/structure/blocks/quiz-bash-commands.json
index 4cd71fb84d9..1f8bfad4d55 100644
--- a/curriculum/structure/blocks/quiz-bash-commands.json
+++ b/curriculum/structure/blocks/quiz-bash-commands.json
@@ -1,6 +1,6 @@
 {
   "name": "Bash Commands Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-bash-commands",
diff --git a/curriculum/structure/blocks/quiz-bash-scripting.json b/curriculum/structure/blocks/quiz-bash-scripting.json
index 3091165de67..eaa3434389d 100644
--- a/curriculum/structure/blocks/quiz-bash-scripting.json
+++ b/curriculum/structure/blocks/quiz-bash-scripting.json
@@ -1,6 +1,6 @@
 {
   "name": "Bash Scripting Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-bash-scripting",
diff --git a/curriculum/structure/blocks/quiz-basic-css.json b/curriculum/structure/blocks/quiz-basic-css.json
index 144a615ccb3..dffc881a659 100644
--- a/curriculum/structure/blocks/quiz-basic-css.json
+++ b/curriculum/structure/blocks/quiz-basic-css.json
@@ -1,6 +1,6 @@
 {
   "name": "Basic CSS Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-basic-css",
diff --git a/curriculum/structure/blocks/quiz-basic-html.json b/curriculum/structure/blocks/quiz-basic-html.json
index 5398caf1e8f..00d2eec62ab 100644
--- a/curriculum/structure/blocks/quiz-basic-html.json
+++ b/curriculum/structure/blocks/quiz-basic-html.json
@@ -1,6 +1,6 @@
 {
   "name": "Basic HTML Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-basic-html",
diff --git a/curriculum/structure/blocks/quiz-classes-and-objects.json b/curriculum/structure/blocks/quiz-classes-and-objects.json
index a492979e920..38f7d701590 100644
--- a/curriculum/structure/blocks/quiz-classes-and-objects.json
+++ b/curriculum/structure/blocks/quiz-classes-and-objects.json
@@ -1,6 +1,6 @@
 {
   "name": "Classes and Objects Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "quiz-classes-and-objects",
diff --git a/curriculum/structure/blocks/quiz-computer-basics.json b/curriculum/structure/blocks/quiz-computer-basics.json
index ca75b3d0b78..f4bbfee3386 100644
--- a/curriculum/structure/blocks/quiz-computer-basics.json
+++ b/curriculum/structure/blocks/quiz-computer-basics.json
@@ -1,6 +1,6 @@
 {
   "name": "Computer Basics Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-computer-basics",
diff --git a/curriculum/structure/blocks/quiz-css-accessibility.json b/curriculum/structure/blocks/quiz-css-accessibility.json
index 9f6bab3c76c..8d3cb4ba6d3 100644
--- a/curriculum/structure/blocks/quiz-css-accessibility.json
+++ b/curriculum/structure/blocks/quiz-css-accessibility.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Accessibility Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-accessibility",
diff --git a/curriculum/structure/blocks/quiz-css-animations.json b/curriculum/structure/blocks/quiz-css-animations.json
index b8f4acb14aa..d41f53686f5 100644
--- a/curriculum/structure/blocks/quiz-css-animations.json
+++ b/curriculum/structure/blocks/quiz-css-animations.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Animations Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-animations",
diff --git a/curriculum/structure/blocks/quiz-css-attribute-selectors.json b/curriculum/structure/blocks/quiz-css-attribute-selectors.json
index 404a6646d1e..d0b15ea6993 100644
--- a/curriculum/structure/blocks/quiz-css-attribute-selectors.json
+++ b/curriculum/structure/blocks/quiz-css-attribute-selectors.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Attribute Selectors Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-attribute-selectors",
diff --git a/curriculum/structure/blocks/quiz-css-backgrounds-and-borders.json b/curriculum/structure/blocks/quiz-css-backgrounds-and-borders.json
index c658176d6d8..2dd8ffa751d 100644
--- a/curriculum/structure/blocks/quiz-css-backgrounds-and-borders.json
+++ b/curriculum/structure/blocks/quiz-css-backgrounds-and-borders.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Backgrounds and Borders Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-backgrounds-and-borders",
diff --git a/curriculum/structure/blocks/quiz-css-colors.json b/curriculum/structure/blocks/quiz-css-colors.json
index a85957fe518..9b4664b6177 100644
--- a/curriculum/structure/blocks/quiz-css-colors.json
+++ b/curriculum/structure/blocks/quiz-css-colors.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Colors Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-colors",
diff --git a/curriculum/structure/blocks/quiz-css-flexbox.json b/curriculum/structure/blocks/quiz-css-flexbox.json
index 26f21b511b8..c829aa95a9b 100644
--- a/curriculum/structure/blocks/quiz-css-flexbox.json
+++ b/curriculum/structure/blocks/quiz-css-flexbox.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Flexbox Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-flexbox",
diff --git a/curriculum/structure/blocks/quiz-css-grid.json b/curriculum/structure/blocks/quiz-css-grid.json
index 39260d687f8..d522e98a7d1 100644
--- a/curriculum/structure/blocks/quiz-css-grid.json
+++ b/curriculum/structure/blocks/quiz-css-grid.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Grid Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-grid",
diff --git a/curriculum/structure/blocks/quiz-css-layout-and-effects.json b/curriculum/structure/blocks/quiz-css-layout-and-effects.json
index d621209e9d6..436c016e75e 100644
--- a/curriculum/structure/blocks/quiz-css-layout-and-effects.json
+++ b/curriculum/structure/blocks/quiz-css-layout-and-effects.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Layout and Effects Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-layout-and-effects",
diff --git a/curriculum/structure/blocks/quiz-css-libraries-and-frameworks.json b/curriculum/structure/blocks/quiz-css-libraries-and-frameworks.json
index e5a002648b0..27a109a844d 100644
--- a/curriculum/structure/blocks/quiz-css-libraries-and-frameworks.json
+++ b/curriculum/structure/blocks/quiz-css-libraries-and-frameworks.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Libraries and Frameworks Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-libraries-and-frameworks",
diff --git a/curriculum/structure/blocks/quiz-css-positioning.json b/curriculum/structure/blocks/quiz-css-positioning.json
index b07dad07111..4f873de6021 100644
--- a/curriculum/structure/blocks/quiz-css-positioning.json
+++ b/curriculum/structure/blocks/quiz-css-positioning.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Positioning Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-positioning",
diff --git a/curriculum/structure/blocks/quiz-css-pseudo-classes.json b/curriculum/structure/blocks/quiz-css-pseudo-classes.json
index 9c48c47f6a5..35672154d0f 100644
--- a/curriculum/structure/blocks/quiz-css-pseudo-classes.json
+++ b/curriculum/structure/blocks/quiz-css-pseudo-classes.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Pseudo-classes Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-pseudo-classes",
diff --git a/curriculum/structure/blocks/quiz-css-relative-and-absolute-units.json b/curriculum/structure/blocks/quiz-css-relative-and-absolute-units.json
index faa6f222dbb..b6489e93e72 100644
--- a/curriculum/structure/blocks/quiz-css-relative-and-absolute-units.json
+++ b/curriculum/structure/blocks/quiz-css-relative-and-absolute-units.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Relative and Absolute Units Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-relative-and-absolute-units",
diff --git a/curriculum/structure/blocks/quiz-css-typography.json b/curriculum/structure/blocks/quiz-css-typography.json
index ed823b244d9..f6eeeacf4c7 100644
--- a/curriculum/structure/blocks/quiz-css-typography.json
+++ b/curriculum/structure/blocks/quiz-css-typography.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Typography Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-typography",
diff --git a/curriculum/structure/blocks/quiz-css-variables.json b/curriculum/structure/blocks/quiz-css-variables.json
index 068e6ef20ea..4e2468eeb17 100644
--- a/curriculum/structure/blocks/quiz-css-variables.json
+++ b/curriculum/structure/blocks/quiz-css-variables.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Variables Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-css-variables",
diff --git a/curriculum/structure/blocks/quiz-data-structures.json b/curriculum/structure/blocks/quiz-data-structures.json
index b899d08b4f2..2117fcf8cde 100644
--- a/curriculum/structure/blocks/quiz-data-structures.json
+++ b/curriculum/structure/blocks/quiz-data-structures.json
@@ -1,6 +1,6 @@
 {
   "name": "Data Structures Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "quiz-data-structures",
diff --git a/curriculum/structure/blocks/quiz-debugging-javascript.json b/curriculum/structure/blocks/quiz-debugging-javascript.json
index b6df0549a1f..f98508a6ca9 100644
--- a/curriculum/structure/blocks/quiz-debugging-javascript.json
+++ b/curriculum/structure/blocks/quiz-debugging-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Debugging JavaScript Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-debugging-javascript",
diff --git a/curriculum/structure/blocks/quiz-design-fundamentals.json b/curriculum/structure/blocks/quiz-design-fundamentals.json
index 57d469b098e..63cbe45a3ba 100644
--- a/curriculum/structure/blocks/quiz-design-fundamentals.json
+++ b/curriculum/structure/blocks/quiz-design-fundamentals.json
@@ -1,6 +1,6 @@
 {
   "name": "Design Fundamentals Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-design-fundamentals",
diff --git a/curriculum/structure/blocks/quiz-dictionaries-and-sets.json b/curriculum/structure/blocks/quiz-dictionaries-and-sets.json
index b5d9d7e04e0..834353f58ee 100644
--- a/curriculum/structure/blocks/quiz-dictionaries-and-sets.json
+++ b/curriculum/structure/blocks/quiz-dictionaries-and-sets.json
@@ -1,6 +1,6 @@
 {
   "name": "Dictionaries and Sets Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-dictionaries-and-sets",
diff --git a/curriculum/structure/blocks/quiz-dom-manipulation-and-click-event-with-javascript.json b/curriculum/structure/blocks/quiz-dom-manipulation-and-click-event-with-javascript.json
index adb84945b3a..bb5f636d8be 100644
--- a/curriculum/structure/blocks/quiz-dom-manipulation-and-click-event-with-javascript.json
+++ b/curriculum/structure/blocks/quiz-dom-manipulation-and-click-event-with-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "DOM Manipulation and Click Events with JavaScript Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-dom-manipulation-and-click-event-with-javascript",
diff --git a/curriculum/structure/blocks/quiz-dynamic-programming.json b/curriculum/structure/blocks/quiz-dynamic-programming.json
index 924b82c66fc..27bfc3429b7 100644
--- a/curriculum/structure/blocks/quiz-dynamic-programming.json
+++ b/curriculum/structure/blocks/quiz-dynamic-programming.json
@@ -1,6 +1,6 @@
 {
   "name": "Dynamic Programming Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "quiz-dynamic-programming",
diff --git a/curriculum/structure/blocks/quiz-error-handling.json b/curriculum/structure/blocks/quiz-error-handling.json
index 090179d9b08..d43b12e47ce 100644
--- a/curriculum/structure/blocks/quiz-error-handling.json
+++ b/curriculum/structure/blocks/quiz-error-handling.json
@@ -1,6 +1,6 @@
 {
   "name": "Error Handling Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-error-handling",
diff --git a/curriculum/structure/blocks/quiz-form-validation-with-javascript.json b/curriculum/structure/blocks/quiz-form-validation-with-javascript.json
index 26b1a39c543..7770b1d36ef 100644
--- a/curriculum/structure/blocks/quiz-form-validation-with-javascript.json
+++ b/curriculum/structure/blocks/quiz-form-validation-with-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Form Validation with JavaScript Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-form-validation-with-javascript",
diff --git a/curriculum/structure/blocks/quiz-git.json b/curriculum/structure/blocks/quiz-git.json
index 01de6da6266..d9201b4a62f 100644
--- a/curriculum/structure/blocks/quiz-git.json
+++ b/curriculum/structure/blocks/quiz-git.json
@@ -1,6 +1,6 @@
 {
   "name": "Git Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-git",
diff --git a/curriculum/structure/blocks/quiz-graphs-and-trees.json b/curriculum/structure/blocks/quiz-graphs-and-trees.json
index fd99eee2ca8..689e3aa7dc3 100644
--- a/curriculum/structure/blocks/quiz-graphs-and-trees.json
+++ b/curriculum/structure/blocks/quiz-graphs-and-trees.json
@@ -1,6 +1,6 @@
 {
   "name": "Graphs and Trees Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "quiz-graphs-and-trees",
diff --git a/curriculum/structure/blocks/quiz-html-accessibility.json b/curriculum/structure/blocks/quiz-html-accessibility.json
index 34363d8c671..6bf826a0f7e 100644
--- a/curriculum/structure/blocks/quiz-html-accessibility.json
+++ b/curriculum/structure/blocks/quiz-html-accessibility.json
@@ -1,6 +1,6 @@
 {
   "name": "HTML Accessibility Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-html-accessibility",
diff --git a/curriculum/structure/blocks/quiz-html-tables-and-forms.json b/curriculum/structure/blocks/quiz-html-tables-and-forms.json
index 5a39915a322..d984cbf1ff6 100644
--- a/curriculum/structure/blocks/quiz-html-tables-and-forms.json
+++ b/curriculum/structure/blocks/quiz-html-tables-and-forms.json
@@ -1,6 +1,6 @@
 {
   "name": "HTML Tables and Forms Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-html-tables-and-forms",
diff --git a/curriculum/structure/blocks/quiz-javascript-arrays.json b/curriculum/structure/blocks/quiz-javascript-arrays.json
index 3bb534540b4..430b484f69e 100644
--- a/curriculum/structure/blocks/quiz-javascript-arrays.json
+++ b/curriculum/structure/blocks/quiz-javascript-arrays.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Arrays Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-arrays",
diff --git a/curriculum/structure/blocks/quiz-javascript-audio-and-video.json b/curriculum/structure/blocks/quiz-javascript-audio-and-video.json
index 47bffb947df..7d54f54c719 100644
--- a/curriculum/structure/blocks/quiz-javascript-audio-and-video.json
+++ b/curriculum/structure/blocks/quiz-javascript-audio-and-video.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Audio and Video Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-audio-and-video",
diff --git a/curriculum/structure/blocks/quiz-javascript-classes.json b/curriculum/structure/blocks/quiz-javascript-classes.json
index 388c647f539..ec50226b9c1 100644
--- a/curriculum/structure/blocks/quiz-javascript-classes.json
+++ b/curriculum/structure/blocks/quiz-javascript-classes.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Classes Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-classes",
diff --git a/curriculum/structure/blocks/quiz-javascript-comparisons-and-conditionals.json b/curriculum/structure/blocks/quiz-javascript-comparisons-and-conditionals.json
index dfb34a6d054..185a240740e 100644
--- a/curriculum/structure/blocks/quiz-javascript-comparisons-and-conditionals.json
+++ b/curriculum/structure/blocks/quiz-javascript-comparisons-and-conditionals.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Comparisons and Conditionals Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-comparisons-and-conditionals",
diff --git a/curriculum/structure/blocks/quiz-javascript-dates.json b/curriculum/structure/blocks/quiz-javascript-dates.json
index b0f0e3a4b3e..df8439e351c 100644
--- a/curriculum/structure/blocks/quiz-javascript-dates.json
+++ b/curriculum/structure/blocks/quiz-javascript-dates.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Dates Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-dates",
diff --git a/curriculum/structure/blocks/quiz-javascript-functional-programming.json b/curriculum/structure/blocks/quiz-javascript-functional-programming.json
index 7679c68761e..ea4c0273767 100644
--- a/curriculum/structure/blocks/quiz-javascript-functional-programming.json
+++ b/curriculum/structure/blocks/quiz-javascript-functional-programming.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Functional Programming Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-functional-programming",
diff --git a/curriculum/structure/blocks/quiz-javascript-functions.json b/curriculum/structure/blocks/quiz-javascript-functions.json
index 0c1ad6885db..8be20f6a1db 100644
--- a/curriculum/structure/blocks/quiz-javascript-functions.json
+++ b/curriculum/structure/blocks/quiz-javascript-functions.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Functions Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-functions",
diff --git a/curriculum/structure/blocks/quiz-javascript-fundamentals.json b/curriculum/structure/blocks/quiz-javascript-fundamentals.json
index 00cf7336c9e..76319c71594 100644
--- a/curriculum/structure/blocks/quiz-javascript-fundamentals.json
+++ b/curriculum/structure/blocks/quiz-javascript-fundamentals.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Fundamentals Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-fundamentals",
diff --git a/curriculum/structure/blocks/quiz-javascript-higher-order-functions.json b/curriculum/structure/blocks/quiz-javascript-higher-order-functions.json
index 4fe7899305c..858999ba37c 100644
--- a/curriculum/structure/blocks/quiz-javascript-higher-order-functions.json
+++ b/curriculum/structure/blocks/quiz-javascript-higher-order-functions.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Higher Order Functions Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-higher-order-functions",
diff --git a/curriculum/structure/blocks/quiz-javascript-loops.json b/curriculum/structure/blocks/quiz-javascript-loops.json
index 3b4a61f3ebb..e81d6da37e7 100644
--- a/curriculum/structure/blocks/quiz-javascript-loops.json
+++ b/curriculum/structure/blocks/quiz-javascript-loops.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Loops Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-loops",
diff --git a/curriculum/structure/blocks/quiz-javascript-maps-and-sets.json b/curriculum/structure/blocks/quiz-javascript-maps-and-sets.json
index dec183b3200..9546d7873dc 100644
--- a/curriculum/structure/blocks/quiz-javascript-maps-and-sets.json
+++ b/curriculum/structure/blocks/quiz-javascript-maps-and-sets.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Maps and Sets Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-maps-and-sets",
diff --git a/curriculum/structure/blocks/quiz-javascript-math.json b/curriculum/structure/blocks/quiz-javascript-math.json
index 2d8e4026ced..cf70da45314 100644
--- a/curriculum/structure/blocks/quiz-javascript-math.json
+++ b/curriculum/structure/blocks/quiz-javascript-math.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Math Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-math",
diff --git a/curriculum/structure/blocks/quiz-javascript-objects.json b/curriculum/structure/blocks/quiz-javascript-objects.json
index 991f6a5bd7d..f109f132bfa 100644
--- a/curriculum/structure/blocks/quiz-javascript-objects.json
+++ b/curriculum/structure/blocks/quiz-javascript-objects.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Objects Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-objects",
diff --git a/curriculum/structure/blocks/quiz-javascript-regular-expressions.json b/curriculum/structure/blocks/quiz-javascript-regular-expressions.json
index ca6a5f9634d..ecb2a7a7b09 100644
--- a/curriculum/structure/blocks/quiz-javascript-regular-expressions.json
+++ b/curriculum/structure/blocks/quiz-javascript-regular-expressions.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Regular Expressions Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-regular-expressions",
diff --git a/curriculum/structure/blocks/quiz-javascript-strings.json b/curriculum/structure/blocks/quiz-javascript-strings.json
index d2b7a117cda..9d77153e22b 100644
--- a/curriculum/structure/blocks/quiz-javascript-strings.json
+++ b/curriculum/structure/blocks/quiz-javascript-strings.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Strings Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-strings",
diff --git a/curriculum/structure/blocks/quiz-javascript-variables-and-data-types.json b/curriculum/structure/blocks/quiz-javascript-variables-and-data-types.json
index 3e57fec1e08..dfb6beed3a8 100644
--- a/curriculum/structure/blocks/quiz-javascript-variables-and-data-types.json
+++ b/curriculum/structure/blocks/quiz-javascript-variables-and-data-types.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Variables and Data Types Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-javascript-variables-and-data-types",
diff --git a/curriculum/structure/blocks/quiz-js-a11y.json b/curriculum/structure/blocks/quiz-js-a11y.json
index 49bda8649d7..e398306f757 100644
--- a/curriculum/structure/blocks/quiz-js-a11y.json
+++ b/curriculum/structure/blocks/quiz-js-a11y.json
@@ -1,7 +1,7 @@
 {
   "name": "JavaScript and Accessibility Quiz",
   "isUpcomingChange": false,
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "dashedName": "quiz-js-a11y",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/quiz-local-storage-and-crud.json b/curriculum/structure/blocks/quiz-local-storage-and-crud.json
index 52f6f86267e..8ae041a8ab0 100644
--- a/curriculum/structure/blocks/quiz-local-storage-and-crud.json
+++ b/curriculum/structure/blocks/quiz-local-storage-and-crud.json
@@ -1,6 +1,6 @@
 {
   "name": "Local Storage and CRUD Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-local-storage-and-crud",
diff --git a/curriculum/structure/blocks/quiz-loops-and-sequences.json b/curriculum/structure/blocks/quiz-loops-and-sequences.json
index 029dcf8eb2f..015156fd4c3 100644
--- a/curriculum/structure/blocks/quiz-loops-and-sequences.json
+++ b/curriculum/structure/blocks/quiz-loops-and-sequences.json
@@ -1,6 +1,6 @@
 {
   "name": "Loops and Sequences Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-loops-and-sequences",
diff --git a/curriculum/structure/blocks/quiz-object-oriented-programming.json b/curriculum/structure/blocks/quiz-object-oriented-programming.json
index 196c3fca102..88bb9391e56 100644
--- a/curriculum/structure/blocks/quiz-object-oriented-programming.json
+++ b/curriculum/structure/blocks/quiz-object-oriented-programming.json
@@ -1,6 +1,6 @@
 {
   "name": "Object Oriented Programming Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "quiz-object-oriented-programming",
diff --git a/curriculum/structure/blocks/quiz-python-basics.json b/curriculum/structure/blocks/quiz-python-basics.json
index d91266d79ec..ec532dfb941 100644
--- a/curriculum/structure/blocks/quiz-python-basics.json
+++ b/curriculum/structure/blocks/quiz-python-basics.json
@@ -1,6 +1,6 @@
 {
   "name": "Python Basics Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-python-basics",
diff --git a/curriculum/structure/blocks/quiz-react-basics.json b/curriculum/structure/blocks/quiz-react-basics.json
index 16c98167a6b..6876317bcfc 100644
--- a/curriculum/structure/blocks/quiz-react-basics.json
+++ b/curriculum/structure/blocks/quiz-react-basics.json
@@ -1,6 +1,6 @@
 {
   "name": "React Basics Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-react-basics",
diff --git a/curriculum/structure/blocks/quiz-react-forms-data-fetching-and-routing.json b/curriculum/structure/blocks/quiz-react-forms-data-fetching-and-routing.json
index 3d1a41cdebb..801d2822166 100644
--- a/curriculum/structure/blocks/quiz-react-forms-data-fetching-and-routing.json
+++ b/curriculum/structure/blocks/quiz-react-forms-data-fetching-and-routing.json
@@ -1,6 +1,6 @@
 {
   "name": "React Forms, Data Fetching and Routing Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-react-forms-data-fetching-and-routing",
diff --git a/curriculum/structure/blocks/quiz-react-state-and-hooks.json b/curriculum/structure/blocks/quiz-react-state-and-hooks.json
index 9b9ee2be197..f1c74100b38 100644
--- a/curriculum/structure/blocks/quiz-react-state-and-hooks.json
+++ b/curriculum/structure/blocks/quiz-react-state-and-hooks.json
@@ -1,6 +1,6 @@
 {
   "name": "React State and Hooks Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-react-state-and-hooks",
diff --git a/curriculum/structure/blocks/quiz-recursion.json b/curriculum/structure/blocks/quiz-recursion.json
index f6d16d40acf..2cb9e88f69c 100644
--- a/curriculum/structure/blocks/quiz-recursion.json
+++ b/curriculum/structure/blocks/quiz-recursion.json
@@ -1,6 +1,6 @@
 {
   "name": "Recursion Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-recursion",
diff --git a/curriculum/structure/blocks/quiz-responsive-web-design.json b/curriculum/structure/blocks/quiz-responsive-web-design.json
index aaa777a8a1c..d486ad71a5f 100644
--- a/curriculum/structure/blocks/quiz-responsive-web-design.json
+++ b/curriculum/structure/blocks/quiz-responsive-web-design.json
@@ -1,6 +1,6 @@
 {
   "name": "Responsive Web Design Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-responsive-web-design",
diff --git a/curriculum/structure/blocks/quiz-searching-and-sorting-algorithms.json b/curriculum/structure/blocks/quiz-searching-and-sorting-algorithms.json
index 6cd524919fe..499069dde9c 100644
--- a/curriculum/structure/blocks/quiz-searching-and-sorting-algorithms.json
+++ b/curriculum/structure/blocks/quiz-searching-and-sorting-algorithms.json
@@ -1,6 +1,6 @@
 {
   "name": "Searching and Sorting Algorithms Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "quiz-searching-and-sorting-algorithms",
diff --git a/curriculum/structure/blocks/quiz-semantic-html.json b/curriculum/structure/blocks/quiz-semantic-html.json
index c67c062a751..759789dd2fb 100644
--- a/curriculum/structure/blocks/quiz-semantic-html.json
+++ b/curriculum/structure/blocks/quiz-semantic-html.json
@@ -1,6 +1,6 @@
 {
   "name": "Semantic HTML Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-semantic-html",
diff --git a/curriculum/structure/blocks/quiz-sql-and-postgresql.json b/curriculum/structure/blocks/quiz-sql-and-postgresql.json
index 9355afcaf67..98c925ab3b3 100644
--- a/curriculum/structure/blocks/quiz-sql-and-postgresql.json
+++ b/curriculum/structure/blocks/quiz-sql-and-postgresql.json
@@ -1,6 +1,6 @@
 {
   "name": "SQL and PostgreSQL Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-sql-and-postgresql",
diff --git a/curriculum/structure/blocks/quiz-styling-forms.json b/curriculum/structure/blocks/quiz-styling-forms.json
index 09fc63cb835..e47c1356456 100644
--- a/curriculum/structure/blocks/quiz-styling-forms.json
+++ b/curriculum/structure/blocks/quiz-styling-forms.json
@@ -1,6 +1,6 @@
 {
   "name": "Styling Forms Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-styling-forms",
diff --git a/curriculum/structure/blocks/quiz-testing.json b/curriculum/structure/blocks/quiz-testing.json
index fb07a4512c0..d60e54bb22b 100644
--- a/curriculum/structure/blocks/quiz-testing.json
+++ b/curriculum/structure/blocks/quiz-testing.json
@@ -1,6 +1,6 @@
 {
   "name": "Testing Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-testing",
diff --git a/curriculum/structure/blocks/quiz-typescript.json b/curriculum/structure/blocks/quiz-typescript.json
index 466dfe0282c..8b013b9efc8 100644
--- a/curriculum/structure/blocks/quiz-typescript.json
+++ b/curriculum/structure/blocks/quiz-typescript.json
@@ -1,6 +1,6 @@
 {
   "name": "TypeScript Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "quiz-typescript",
diff --git a/curriculum/structure/blocks/quiz-web-performance.json b/curriculum/structure/blocks/quiz-web-performance.json
index a26af1aacd5..ec9f22a4895 100644
--- a/curriculum/structure/blocks/quiz-web-performance.json
+++ b/curriculum/structure/blocks/quiz-web-performance.json
@@ -1,6 +1,6 @@
 {
   "name": "Web Performance Quiz",
-  "blockType": "quiz",
+  "blockLabel": "quiz",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "quiz-web-performance",
diff --git a/curriculum/structure/blocks/recipe-page.json b/curriculum/structure/blocks/recipe-page.json
index ea114c98f82..e05cb601f7f 100644
--- a/curriculum/structure/blocks/recipe-page.json
+++ b/curriculum/structure/blocks/recipe-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Recipe Page",
-  "blockType": "lab",
+  "blockLabel": "lab",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/review-asynchronous-javascript.json b/curriculum/structure/blocks/review-asynchronous-javascript.json
index e72c846d5ee..c51f0fca429 100644
--- a/curriculum/structure/blocks/review-asynchronous-javascript.json
+++ b/curriculum/structure/blocks/review-asynchronous-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Asynchronous JavaScript Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-asynchronous-javascript",
diff --git a/curriculum/structure/blocks/review-bash-and-sql.json b/curriculum/structure/blocks/review-bash-and-sql.json
index b0248b762f8..03f6a2318e1 100644
--- a/curriculum/structure/blocks/review-bash-and-sql.json
+++ b/curriculum/structure/blocks/review-bash-and-sql.json
@@ -1,6 +1,6 @@
 {
   "name": "Bash and SQL Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-bash-and-sql",
diff --git a/curriculum/structure/blocks/review-bash-commands.json b/curriculum/structure/blocks/review-bash-commands.json
index 4991175d5f4..49428f57e68 100644
--- a/curriculum/structure/blocks/review-bash-commands.json
+++ b/curriculum/structure/blocks/review-bash-commands.json
@@ -1,6 +1,6 @@
 {
   "name": "Bash Commands Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-bash-commands",
diff --git a/curriculum/structure/blocks/review-bash-scripting.json b/curriculum/structure/blocks/review-bash-scripting.json
index a26984feeb5..5ad92ab166e 100644
--- a/curriculum/structure/blocks/review-bash-scripting.json
+++ b/curriculum/structure/blocks/review-bash-scripting.json
@@ -1,6 +1,6 @@
 {
   "name": "Bash Scripting Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-bash-scripting",
diff --git a/curriculum/structure/blocks/review-basic-css.json b/curriculum/structure/blocks/review-basic-css.json
index 46f7a2f5817..9afddf89ccd 100644
--- a/curriculum/structure/blocks/review-basic-css.json
+++ b/curriculum/structure/blocks/review-basic-css.json
@@ -1,6 +1,6 @@
 {
   "name": "Basic CSS Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-basic-css",
diff --git a/curriculum/structure/blocks/review-basic-html.json b/curriculum/structure/blocks/review-basic-html.json
index a89f5a39877..4b9da09b914 100644
--- a/curriculum/structure/blocks/review-basic-html.json
+++ b/curriculum/structure/blocks/review-basic-html.json
@@ -7,5 +7,5 @@
     { "id": "67072fc183c7ca6c588feb4d", "title": "Basic HTML Review" }
   ],
   "helpCategory": "HTML-CSS",
-  "blockType": "review"
+  "blockLabel": "review"
 }
diff --git a/curriculum/structure/blocks/review-classes-and-objects.json b/curriculum/structure/blocks/review-classes-and-objects.json
index 3ba3870413c..52d4e24d443 100644
--- a/curriculum/structure/blocks/review-classes-and-objects.json
+++ b/curriculum/structure/blocks/review-classes-and-objects.json
@@ -6,6 +6,6 @@
     { "id": "67f39d848979082814c07d9c", "title": "Review Classes and Objects" }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-computer-basics.json b/curriculum/structure/blocks/review-computer-basics.json
index d8fbccb988e..7c8d88fba92 100644
--- a/curriculum/structure/blocks/review-computer-basics.json
+++ b/curriculum/structure/blocks/review-computer-basics.json
@@ -1,6 +1,6 @@
 {
   "name": "Computer Basics Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-computer-basics",
diff --git a/curriculum/structure/blocks/review-css-accessibility.json b/curriculum/structure/blocks/review-css-accessibility.json
index 85f758e976e..7ae5e29bfb7 100644
--- a/curriculum/structure/blocks/review-css-accessibility.json
+++ b/curriculum/structure/blocks/review-css-accessibility.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Accessibility Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-accessibility",
diff --git a/curriculum/structure/blocks/review-css-animations.json b/curriculum/structure/blocks/review-css-animations.json
index 739f0df2bb9..96500a74785 100644
--- a/curriculum/structure/blocks/review-css-animations.json
+++ b/curriculum/structure/blocks/review-css-animations.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Animations Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-animations",
diff --git a/curriculum/structure/blocks/review-css-attribute-selectors.json b/curriculum/structure/blocks/review-css-attribute-selectors.json
index 6217792d233..68dfd086090 100644
--- a/curriculum/structure/blocks/review-css-attribute-selectors.json
+++ b/curriculum/structure/blocks/review-css-attribute-selectors.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Attribute Selectors Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-attribute-selectors",
diff --git a/curriculum/structure/blocks/review-css-backgrounds-and-borders.json b/curriculum/structure/blocks/review-css-backgrounds-and-borders.json
index 884f67c206b..4dda7df01b5 100644
--- a/curriculum/structure/blocks/review-css-backgrounds-and-borders.json
+++ b/curriculum/structure/blocks/review-css-backgrounds-and-borders.json
@@ -1,6 +1,6 @@
 {
   "name": "Lists, Links, CSS Background and Borders Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-backgrounds-and-borders",
diff --git a/curriculum/structure/blocks/review-css-colors.json b/curriculum/structure/blocks/review-css-colors.json
index 66953a05298..8bb50aef055 100644
--- a/curriculum/structure/blocks/review-css-colors.json
+++ b/curriculum/structure/blocks/review-css-colors.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Colors Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-colors",
diff --git a/curriculum/structure/blocks/review-css-flexbox.json b/curriculum/structure/blocks/review-css-flexbox.json
index 82031b412f1..47136f7b475 100644
--- a/curriculum/structure/blocks/review-css-flexbox.json
+++ b/curriculum/structure/blocks/review-css-flexbox.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Flexbox Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-flexbox",
diff --git a/curriculum/structure/blocks/review-css-grid.json b/curriculum/structure/blocks/review-css-grid.json
index 0fa67815545..f46ea89f031 100644
--- a/curriculum/structure/blocks/review-css-grid.json
+++ b/curriculum/structure/blocks/review-css-grid.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Grid Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-grid",
diff --git a/curriculum/structure/blocks/review-css-layout-and-effects.json b/curriculum/structure/blocks/review-css-layout-and-effects.json
index cf654506c37..bd36410e087 100644
--- a/curriculum/structure/blocks/review-css-layout-and-effects.json
+++ b/curriculum/structure/blocks/review-css-layout-and-effects.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Layouts and Effects Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-layout-and-effects",
diff --git a/curriculum/structure/blocks/review-css-libraries-and-frameworks.json b/curriculum/structure/blocks/review-css-libraries-and-frameworks.json
index f93f63e4354..32b19a693b2 100644
--- a/curriculum/structure/blocks/review-css-libraries-and-frameworks.json
+++ b/curriculum/structure/blocks/review-css-libraries-and-frameworks.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Libraries and Frameworks Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-libraries-and-frameworks",
diff --git a/curriculum/structure/blocks/review-css-positioning.json b/curriculum/structure/blocks/review-css-positioning.json
index 88d59d2eebf..73da1c6982a 100644
--- a/curriculum/structure/blocks/review-css-positioning.json
+++ b/curriculum/structure/blocks/review-css-positioning.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Positioning Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-positioning",
diff --git a/curriculum/structure/blocks/review-css-pseudo-classes.json b/curriculum/structure/blocks/review-css-pseudo-classes.json
index f643afe8c10..4c29785585b 100644
--- a/curriculum/structure/blocks/review-css-pseudo-classes.json
+++ b/curriculum/structure/blocks/review-css-pseudo-classes.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Pseudo-classes Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-pseudo-classes",
diff --git a/curriculum/structure/blocks/review-css-relative-and-absolute-units.json b/curriculum/structure/blocks/review-css-relative-and-absolute-units.json
index 78580eea303..99392f231a1 100644
--- a/curriculum/structure/blocks/review-css-relative-and-absolute-units.json
+++ b/curriculum/structure/blocks/review-css-relative-and-absolute-units.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Relative and Absolute Units Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-relative-and-absolute-units",
diff --git a/curriculum/structure/blocks/review-css-typography.json b/curriculum/structure/blocks/review-css-typography.json
index dfaf08d4603..a4de57201f9 100644
--- a/curriculum/structure/blocks/review-css-typography.json
+++ b/curriculum/structure/blocks/review-css-typography.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Typography Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-typography",
diff --git a/curriculum/structure/blocks/review-css-variables.json b/curriculum/structure/blocks/review-css-variables.json
index 1ddba806a05..db443259089 100644
--- a/curriculum/structure/blocks/review-css-variables.json
+++ b/curriculum/structure/blocks/review-css-variables.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Variables Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css-variables",
diff --git a/curriculum/structure/blocks/review-css.json b/curriculum/structure/blocks/review-css.json
index 0d0cace1c1f..17d1a8ff623 100644
--- a/curriculum/structure/blocks/review-css.json
+++ b/curriculum/structure/blocks/review-css.json
@@ -1,6 +1,6 @@
 {
   "name": "CSS Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-css",
diff --git a/curriculum/structure/blocks/review-data-structures.json b/curriculum/structure/blocks/review-data-structures.json
index 98943f4533c..c7ee0979c60 100644
--- a/curriculum/structure/blocks/review-data-structures.json
+++ b/curriculum/structure/blocks/review-data-structures.json
@@ -6,6 +6,6 @@
     { "id": "67f39dc7129b092b27099d8c", "title": "Data Structures Review" }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-debugging-javascript.json b/curriculum/structure/blocks/review-debugging-javascript.json
index 21793634f33..4095a542d7c 100644
--- a/curriculum/structure/blocks/review-debugging-javascript.json
+++ b/curriculum/structure/blocks/review-debugging-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Debugging JavaScript Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-debugging-javascript",
diff --git a/curriculum/structure/blocks/review-design-fundamentals.json b/curriculum/structure/blocks/review-design-fundamentals.json
index 2820524753d..319ab4775a7 100644
--- a/curriculum/structure/blocks/review-design-fundamentals.json
+++ b/curriculum/structure/blocks/review-design-fundamentals.json
@@ -1,6 +1,6 @@
 {
   "name": "Design Fundamentals Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-design-fundamentals",
diff --git a/curriculum/structure/blocks/review-dictionaries-and-sets.json b/curriculum/structure/blocks/review-dictionaries-and-sets.json
index 899082aedfc..aa24cd6fc02 100644
--- a/curriculum/structure/blocks/review-dictionaries-and-sets.json
+++ b/curriculum/structure/blocks/review-dictionaries-and-sets.json
@@ -9,6 +9,6 @@
     }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-dom-manipulation-and-click-events-with-javascript.json b/curriculum/structure/blocks/review-dom-manipulation-and-click-events-with-javascript.json
index 1a14e2387dc..f5eb7d8d390 100644
--- a/curriculum/structure/blocks/review-dom-manipulation-and-click-events-with-javascript.json
+++ b/curriculum/structure/blocks/review-dom-manipulation-and-click-events-with-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "DOM Manipulation and Click Events with JavaScript Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-dom-manipulation-and-click-events-with-javascript",
diff --git a/curriculum/structure/blocks/review-dynamic-programming.json b/curriculum/structure/blocks/review-dynamic-programming.json
index e21794d4b56..09f724572e3 100644
--- a/curriculum/structure/blocks/review-dynamic-programming.json
+++ b/curriculum/structure/blocks/review-dynamic-programming.json
@@ -6,6 +6,6 @@
     { "id": "67f39e2119042d2f2ca926ff", "title": "Dynamic Programming Review" }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-error-handling.json b/curriculum/structure/blocks/review-error-handling.json
index d13898ce76b..146b9672384 100644
--- a/curriculum/structure/blocks/review-error-handling.json
+++ b/curriculum/structure/blocks/review-error-handling.json
@@ -6,6 +6,6 @@
     { "id": "67f39bcb48373420f4f12d62", "title": "Error Handling Review" }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-form-validation-with-javascript.json b/curriculum/structure/blocks/review-form-validation-with-javascript.json
index dac818c01bb..852919516ff 100644
--- a/curriculum/structure/blocks/review-form-validation-with-javascript.json
+++ b/curriculum/structure/blocks/review-form-validation-with-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "Form Validation with JavaScript Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-form-validation-with-javascript",
diff --git a/curriculum/structure/blocks/review-front-end-libraries.json b/curriculum/structure/blocks/review-front-end-libraries.json
index 9eee1a73564..b8bc6087904 100644
--- a/curriculum/structure/blocks/review-front-end-libraries.json
+++ b/curriculum/structure/blocks/review-front-end-libraries.json
@@ -1,6 +1,6 @@
 {
   "name": "Front End Libraries Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "review-front-end-libraries",
diff --git a/curriculum/structure/blocks/review-git.json b/curriculum/structure/blocks/review-git.json
index 9a7b47bf437..c4b68f8c0cc 100644
--- a/curriculum/structure/blocks/review-git.json
+++ b/curriculum/structure/blocks/review-git.json
@@ -1,6 +1,6 @@
 {
   "name": "Git Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-git",
diff --git a/curriculum/structure/blocks/review-graphs-and-trees.json b/curriculum/structure/blocks/review-graphs-and-trees.json
index 1400e64c7b0..d52195cb72a 100644
--- a/curriculum/structure/blocks/review-graphs-and-trees.json
+++ b/curriculum/structure/blocks/review-graphs-and-trees.json
@@ -6,6 +6,6 @@
     { "id": "67f39e06b8a11b2de9ccd361", "title": "Graphs and Trees Review" }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-html-accessibility.json b/curriculum/structure/blocks/review-html-accessibility.json
index afdc90b5849..3b7adfea13a 100644
--- a/curriculum/structure/blocks/review-html-accessibility.json
+++ b/curriculum/structure/blocks/review-html-accessibility.json
@@ -1,6 +1,6 @@
 {
   "name": "HTML Accessibility Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-html-accessibility",
diff --git a/curriculum/structure/blocks/review-html-tables-and-forms.json b/curriculum/structure/blocks/review-html-tables-and-forms.json
index 4d78aee148e..83b43f510b9 100644
--- a/curriculum/structure/blocks/review-html-tables-and-forms.json
+++ b/curriculum/structure/blocks/review-html-tables-and-forms.json
@@ -1,6 +1,6 @@
 {
   "name": "HTML Tables and Forms Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-html-tables-and-forms",
diff --git a/curriculum/structure/blocks/review-html.json b/curriculum/structure/blocks/review-html.json
index ea79281b36f..1e8207c241b 100644
--- a/curriculum/structure/blocks/review-html.json
+++ b/curriculum/structure/blocks/review-html.json
@@ -1,6 +1,6 @@
 {
   "name": "HTML Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-html",
diff --git a/curriculum/structure/blocks/review-javascript-arrays.json b/curriculum/structure/blocks/review-javascript-arrays.json
index f61059cc464..7c4e6a2099d 100644
--- a/curriculum/structure/blocks/review-javascript-arrays.json
+++ b/curriculum/structure/blocks/review-javascript-arrays.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Arrays Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-arrays",
diff --git a/curriculum/structure/blocks/review-javascript-audio-and-video.json b/curriculum/structure/blocks/review-javascript-audio-and-video.json
index 79896e98839..68c6876b402 100644
--- a/curriculum/structure/blocks/review-javascript-audio-and-video.json
+++ b/curriculum/structure/blocks/review-javascript-audio-and-video.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Audio and Video Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-audio-and-video",
diff --git a/curriculum/structure/blocks/review-javascript-classes.json b/curriculum/structure/blocks/review-javascript-classes.json
index beb83a39729..79c48cae44e 100644
--- a/curriculum/structure/blocks/review-javascript-classes.json
+++ b/curriculum/structure/blocks/review-javascript-classes.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Classes Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-classes",
diff --git a/curriculum/structure/blocks/review-javascript-comparisons-and-conditionals.json b/curriculum/structure/blocks/review-javascript-comparisons-and-conditionals.json
index 85eac3155dd..d02cb7aa432 100644
--- a/curriculum/structure/blocks/review-javascript-comparisons-and-conditionals.json
+++ b/curriculum/structure/blocks/review-javascript-comparisons-and-conditionals.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Comparisons and Conditionals Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-comparisons-and-conditionals",
diff --git a/curriculum/structure/blocks/review-javascript-dates.json b/curriculum/structure/blocks/review-javascript-dates.json
index fce3df5dbcd..e5e9b558a2a 100644
--- a/curriculum/structure/blocks/review-javascript-dates.json
+++ b/curriculum/structure/blocks/review-javascript-dates.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Dates Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-dates",
diff --git a/curriculum/structure/blocks/review-javascript-functional-programming.json b/curriculum/structure/blocks/review-javascript-functional-programming.json
index 2f5b04873ea..e645676d33c 100644
--- a/curriculum/structure/blocks/review-javascript-functional-programming.json
+++ b/curriculum/structure/blocks/review-javascript-functional-programming.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Functional Programming Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-functional-programming",
diff --git a/curriculum/structure/blocks/review-javascript-functions.json b/curriculum/structure/blocks/review-javascript-functions.json
index 71b1dbfa22c..c01a0e06deb 100644
--- a/curriculum/structure/blocks/review-javascript-functions.json
+++ b/curriculum/structure/blocks/review-javascript-functions.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Functions Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-functions",
diff --git a/curriculum/structure/blocks/review-javascript-fundamentals.json b/curriculum/structure/blocks/review-javascript-fundamentals.json
index c24c2b6da25..0ea031ccc92 100644
--- a/curriculum/structure/blocks/review-javascript-fundamentals.json
+++ b/curriculum/structure/blocks/review-javascript-fundamentals.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Fundamentals Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-fundamentals",
diff --git a/curriculum/structure/blocks/review-javascript-higher-order-functions.json b/curriculum/structure/blocks/review-javascript-higher-order-functions.json
index d3be6be185c..bbf487ce662 100644
--- a/curriculum/structure/blocks/review-javascript-higher-order-functions.json
+++ b/curriculum/structure/blocks/review-javascript-higher-order-functions.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Higher Order Functions Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-higher-order-functions",
diff --git a/curriculum/structure/blocks/review-javascript-loops.json b/curriculum/structure/blocks/review-javascript-loops.json
index 3d138038205..04dc4e3dd27 100644
--- a/curriculum/structure/blocks/review-javascript-loops.json
+++ b/curriculum/structure/blocks/review-javascript-loops.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Loops Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-loops",
diff --git a/curriculum/structure/blocks/review-javascript-maps-and-sets.json b/curriculum/structure/blocks/review-javascript-maps-and-sets.json
index 579a9566fae..fc09df37c1b 100644
--- a/curriculum/structure/blocks/review-javascript-maps-and-sets.json
+++ b/curriculum/structure/blocks/review-javascript-maps-and-sets.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Maps and Sets Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-maps-and-sets",
diff --git a/curriculum/structure/blocks/review-javascript-math.json b/curriculum/structure/blocks/review-javascript-math.json
index 84bedadaa07..c0a482b464e 100644
--- a/curriculum/structure/blocks/review-javascript-math.json
+++ b/curriculum/structure/blocks/review-javascript-math.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Math Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-math",
diff --git a/curriculum/structure/blocks/review-javascript-objects.json b/curriculum/structure/blocks/review-javascript-objects.json
index edac83057b8..8993e346054 100644
--- a/curriculum/structure/blocks/review-javascript-objects.json
+++ b/curriculum/structure/blocks/review-javascript-objects.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Objects Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-objects",
diff --git a/curriculum/structure/blocks/review-javascript-regular-expressions.json b/curriculum/structure/blocks/review-javascript-regular-expressions.json
index 1f85ab0eb70..68bd16b9394 100644
--- a/curriculum/structure/blocks/review-javascript-regular-expressions.json
+++ b/curriculum/structure/blocks/review-javascript-regular-expressions.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Regular Expressions Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-regular-expressions",
diff --git a/curriculum/structure/blocks/review-javascript-strings.json b/curriculum/structure/blocks/review-javascript-strings.json
index 2404858f98d..2c2df42435c 100644
--- a/curriculum/structure/blocks/review-javascript-strings.json
+++ b/curriculum/structure/blocks/review-javascript-strings.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Strings Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-strings",
diff --git a/curriculum/structure/blocks/review-javascript-variables-and-data-types.json b/curriculum/structure/blocks/review-javascript-variables-and-data-types.json
index 3aab2b40b44..3d8472d81c6 100644
--- a/curriculum/structure/blocks/review-javascript-variables-and-data-types.json
+++ b/curriculum/structure/blocks/review-javascript-variables-and-data-types.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Variables and Data Types Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript-variables-and-data-types",
diff --git a/curriculum/structure/blocks/review-javascript.json b/curriculum/structure/blocks/review-javascript.json
index f8fab2fc79b..bea85698cec 100644
--- a/curriculum/structure/blocks/review-javascript.json
+++ b/curriculum/structure/blocks/review-javascript.json
@@ -1,6 +1,6 @@
 {
   "name": "JavaScript Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-javascript",
diff --git a/curriculum/structure/blocks/review-js-a11y.json b/curriculum/structure/blocks/review-js-a11y.json
index 55f16549d27..203f48bfef8 100644
--- a/curriculum/structure/blocks/review-js-a11y.json
+++ b/curriculum/structure/blocks/review-js-a11y.json
@@ -1,7 +1,7 @@
 {
   "name": "JavaScript and Accessibility Review",
   "isUpcomingChange": false,
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "dashedName": "review-js-a11y",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/review-local-storage-and-crud.json b/curriculum/structure/blocks/review-local-storage-and-crud.json
index 579f215c113..218d6b82c1a 100644
--- a/curriculum/structure/blocks/review-local-storage-and-crud.json
+++ b/curriculum/structure/blocks/review-local-storage-and-crud.json
@@ -1,6 +1,6 @@
 {
   "name": "Local Storage and CRUD Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-local-storage-and-crud",
diff --git a/curriculum/structure/blocks/review-loops-and-sequences.json b/curriculum/structure/blocks/review-loops-and-sequences.json
index 2429fe42356..0fd6bc4c95c 100644
--- a/curriculum/structure/blocks/review-loops-and-sequences.json
+++ b/curriculum/structure/blocks/review-loops-and-sequences.json
@@ -6,6 +6,6 @@
     { "id": "67f39b91583dec1e1eddbb9e", "title": "Loops and Sequences Review" }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-object-oriented-programming.json b/curriculum/structure/blocks/review-object-oriented-programming.json
index beb308945a9..c246be72f12 100644
--- a/curriculum/structure/blocks/review-object-oriented-programming.json
+++ b/curriculum/structure/blocks/review-object-oriented-programming.json
@@ -9,6 +9,6 @@
     }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-python-basics.json b/curriculum/structure/blocks/review-python-basics.json
index 0a0857d6d6f..1baf8562ab5 100644
--- a/curriculum/structure/blocks/review-python-basics.json
+++ b/curriculum/structure/blocks/review-python-basics.json
@@ -6,6 +6,6 @@
     { "id": "67f39b40deaec81a3e40e0c5", "title": "Python Basics Review" }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-python.json b/curriculum/structure/blocks/review-python.json
index 3aebcee1094..046eb0fa5d7 100644
--- a/curriculum/structure/blocks/review-python.json
+++ b/curriculum/structure/blocks/review-python.json
@@ -6,6 +6,6 @@
     { "id": "67f39e391c9b373069def02c", "title": "Python Review" }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-react-basics.json b/curriculum/structure/blocks/review-react-basics.json
index 8e83ef6a7c3..45b1d6e6a5d 100644
--- a/curriculum/structure/blocks/review-react-basics.json
+++ b/curriculum/structure/blocks/review-react-basics.json
@@ -1,6 +1,6 @@
 {
   "name": "React Basics Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-react-basics",
diff --git a/curriculum/structure/blocks/review-react-forms-data-fetching-and-routing.json b/curriculum/structure/blocks/review-react-forms-data-fetching-and-routing.json
index 9e08d90e4b2..722aabd6b58 100644
--- a/curriculum/structure/blocks/review-react-forms-data-fetching-and-routing.json
+++ b/curriculum/structure/blocks/review-react-forms-data-fetching-and-routing.json
@@ -1,7 +1,7 @@
 {
   "name": "React Forms, Data Fetching and Routing Review",
   "isUpcomingChange": false,
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "dashedName": "review-react-forms-data-fetching-and-routing",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/review-react-state-and-hooks.json b/curriculum/structure/blocks/review-react-state-and-hooks.json
index 5c47a99e751..382fedfa1a1 100644
--- a/curriculum/structure/blocks/review-react-state-and-hooks.json
+++ b/curriculum/structure/blocks/review-react-state-and-hooks.json
@@ -1,7 +1,7 @@
 {
   "name": "React State and Hooks Review",
   "isUpcomingChange": false,
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "dashedName": "review-react-state-and-hooks",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/review-recursion.json b/curriculum/structure/blocks/review-recursion.json
index 462d93d2d8a..c0c01d3a618 100644
--- a/curriculum/structure/blocks/review-recursion.json
+++ b/curriculum/structure/blocks/review-recursion.json
@@ -1,6 +1,6 @@
 {
   "name": "Recursion Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-recursion",
diff --git a/curriculum/structure/blocks/review-relational-databases.json b/curriculum/structure/blocks/review-relational-databases.json
index 366dbc21d21..955e131d32b 100644
--- a/curriculum/structure/blocks/review-relational-databases.json
+++ b/curriculum/structure/blocks/review-relational-databases.json
@@ -1,6 +1,6 @@
 {
   "name": "Relational Databases Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-relational-databases",
diff --git a/curriculum/structure/blocks/review-responsive-web-design.json b/curriculum/structure/blocks/review-responsive-web-design.json
index aa9a1a3736f..0421da4ddb7 100644
--- a/curriculum/structure/blocks/review-responsive-web-design.json
+++ b/curriculum/structure/blocks/review-responsive-web-design.json
@@ -1,6 +1,6 @@
 {
   "name": "Responsive Web Design Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-responsive-web-design",
diff --git a/curriculum/structure/blocks/review-searching-and-sorting-algorithms.json b/curriculum/structure/blocks/review-searching-and-sorting-algorithms.json
index 20848a723ef..8f3e6fcba9b 100644
--- a/curriculum/structure/blocks/review-searching-and-sorting-algorithms.json
+++ b/curriculum/structure/blocks/review-searching-and-sorting-algorithms.json
@@ -9,6 +9,6 @@
     }
   ],
   "helpCategory": "Python",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link"
 }
diff --git a/curriculum/structure/blocks/review-semantic-html.json b/curriculum/structure/blocks/review-semantic-html.json
index 98774778c31..e7b8253e5ec 100644
--- a/curriculum/structure/blocks/review-semantic-html.json
+++ b/curriculum/structure/blocks/review-semantic-html.json
@@ -1,6 +1,6 @@
 {
   "name": "Semantic HTML Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-semantic-html",
diff --git a/curriculum/structure/blocks/review-sql-and-postgresql.json b/curriculum/structure/blocks/review-sql-and-postgresql.json
index e2cccd2174b..75666ab3e32 100644
--- a/curriculum/structure/blocks/review-sql-and-postgresql.json
+++ b/curriculum/structure/blocks/review-sql-and-postgresql.json
@@ -1,6 +1,6 @@
 {
   "name": "SQL and PostgreSQL Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-sql-and-postgresql",
diff --git a/curriculum/structure/blocks/review-styling-forms.json b/curriculum/structure/blocks/review-styling-forms.json
index f947502c088..a5316282961 100644
--- a/curriculum/structure/blocks/review-styling-forms.json
+++ b/curriculum/structure/blocks/review-styling-forms.json
@@ -1,6 +1,6 @@
 {
   "name": "Styling Forms Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-styling-forms",
diff --git a/curriculum/structure/blocks/review-testing.json b/curriculum/structure/blocks/review-testing.json
index 713bc7bf2cb..60a7f765c66 100644
--- a/curriculum/structure/blocks/review-testing.json
+++ b/curriculum/structure/blocks/review-testing.json
@@ -1,6 +1,6 @@
 {
   "name": "Testing Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-testing",
diff --git a/curriculum/structure/blocks/review-typescript.json b/curriculum/structure/blocks/review-typescript.json
index 3b5ff7c5960..6e188f9fa1f 100644
--- a/curriculum/structure/blocks/review-typescript.json
+++ b/curriculum/structure/blocks/review-typescript.json
@@ -1,6 +1,6 @@
 {
   "name": "Typescript Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": true,
   "dashedName": "review-typescript",
diff --git a/curriculum/structure/blocks/review-web-performance.json b/curriculum/structure/blocks/review-web-performance.json
index 7aa333f23c4..1cf18901663 100644
--- a/curriculum/structure/blocks/review-web-performance.json
+++ b/curriculum/structure/blocks/review-web-performance.json
@@ -1,6 +1,6 @@
 {
   "name": "Web Performance Review",
-  "blockType": "review",
+  "blockLabel": "review",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "dashedName": "review-web-performance",
diff --git a/curriculum/structure/blocks/workshop-accessibility-quiz.json b/curriculum/structure/blocks/workshop-accessibility-quiz.json
index d802b0d38c4..2e80702b50b 100644
--- a/curriculum/structure/blocks/workshop-accessibility-quiz.json
+++ b/curriculum/structure/blocks/workshop-accessibility-quiz.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Quiz Webpage",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-balance-sheet.json b/curriculum/structure/blocks/workshop-balance-sheet.json
index c9647110ba7..3361f988ad5 100644
--- a/curriculum/structure/blocks/workshop-balance-sheet.json
+++ b/curriculum/structure/blocks/workshop-balance-sheet.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Balance Sheet",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-bash-boilerplate.json b/curriculum/structure/blocks/workshop-bash-boilerplate.json
index ac60cfdd1da..c87aa39e46b 100644
--- a/curriculum/structure/blocks/workshop-bash-boilerplate.json
+++ b/curriculum/structure/blocks/workshop-bash-boilerplate.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Boilerplate",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": false,
diff --git a/curriculum/structure/blocks/workshop-bash-five-programs.json b/curriculum/structure/blocks/workshop-bash-five-programs.json
index 2203148ad5a..b039e05f94a 100644
--- a/curriculum/structure/blocks/workshop-bash-five-programs.json
+++ b/curriculum/structure/blocks/workshop-bash-five-programs.json
@@ -1,6 +1,6 @@
 {
   "name": "Build Five Programs",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": false,
diff --git a/curriculum/structure/blocks/workshop-bike-rental-shop.json b/curriculum/structure/blocks/workshop-bike-rental-shop.json
index 5c3bda6791c..771889135c2 100644
--- a/curriculum/structure/blocks/workshop-bike-rental-shop.json
+++ b/curriculum/structure/blocks/workshop-bike-rental-shop.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Bike Rental Shop",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": false,
diff --git a/curriculum/structure/blocks/workshop-binary-search.json b/curriculum/structure/blocks/workshop-binary-search.json
index 165f5af4731..81fb3a36e0b 100644
--- a/curriculum/structure/blocks/workshop-binary-search.json
+++ b/curriculum/structure/blocks/workshop-binary-search.json
@@ -5,7 +5,7 @@
   "hasEditableBoundaries": true,
   "dashedName": "workshop-binary-search",
   "blockLayout": "challenge-grid",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "challengeOrder": [
     {
       "id": "683ec39565dbc7e3375263b1",
diff --git a/curriculum/structure/blocks/workshop-blog-page.json b/curriculum/structure/blocks/workshop-blog-page.json
index 1b32d0a7e72..d0b0b7fd0e5 100644
--- a/curriculum/structure/blocks/workshop-blog-page.json
+++ b/curriculum/structure/blocks/workshop-blog-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Cat Blog Page",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-breadth-first-search.json b/curriculum/structure/blocks/workshop-breadth-first-search.json
index e86df96c65c..92ef4d67e8c 100644
--- a/curriculum/structure/blocks/workshop-breadth-first-search.json
+++ b/curriculum/structure/blocks/workshop-breadth-first-search.json
@@ -21,6 +21,6 @@
     { "id": "68da6138d70960c197ec5ef5", "title": "Step 13" },
     { "id": "68e03c0b7327c7012f12e333", "title": "Step 14" }
   ],
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "usesMultifileEditor": true
 }
diff --git a/curriculum/structure/blocks/workshop-build-a-heart-icon.json b/curriculum/structure/blocks/workshop-build-a-heart-icon.json
index 3abdc7bedd5..c00ce1a6e27 100644
--- a/curriculum/structure/blocks/workshop-build-a-heart-icon.json
+++ b/curriculum/structure/blocks/workshop-build-a-heart-icon.json
@@ -29,7 +29,7 @@
       "title": "Step 6"
     }
   ],
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true
diff --git a/curriculum/structure/blocks/workshop-build-a-video-display-using-iframe.json b/curriculum/structure/blocks/workshop-build-a-video-display-using-iframe.json
index 1522f320465..3052e2a3880 100644
--- a/curriculum/structure/blocks/workshop-build-a-video-display-using-iframe.json
+++ b/curriculum/structure/blocks/workshop-build-a-video-display-using-iframe.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": false,
   "dashedName": "workshop-build-a-video-display-using-iframe",
   "helpCategory": "HTML-CSS",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "challengeOrder": [
     { "id": "68b94f23f7b3ee14078c89c5", "title": "Step 1" },
diff --git a/curriculum/structure/blocks/workshop-caesar-cipher.json b/curriculum/structure/blocks/workshop-caesar-cipher.json
index 4fd68cbf987..1fc5aa51d93 100644
--- a/curriculum/structure/blocks/workshop-caesar-cipher.json
+++ b/curriculum/structure/blocks/workshop-caesar-cipher.json
@@ -107,6 +107,6 @@
     }
   ],
   "blockLayout": "challenge-grid",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "helpCategory": "Python"
 }
diff --git a/curriculum/structure/blocks/workshop-cafe-menu.json b/curriculum/structure/blocks/workshop-cafe-menu.json
index 9e71d86dc5c..51cb970ff03 100644
--- a/curriculum/structure/blocks/workshop-cafe-menu.json
+++ b/curriculum/structure/blocks/workshop-cafe-menu.json
@@ -1,6 +1,6 @@
 {
   "name": "Design a Cafe Menu",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-calculator.json b/curriculum/structure/blocks/workshop-calculator.json
index ddfda3829d3..6f49af2fea6 100644
--- a/curriculum/structure/blocks/workshop-calculator.json
+++ b/curriculum/structure/blocks/workshop-calculator.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Calculator",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-calorie-counter.json b/curriculum/structure/blocks/workshop-calorie-counter.json
index 3148e010a20..bdcb4549928 100644
--- a/curriculum/structure/blocks/workshop-calorie-counter.json
+++ b/curriculum/structure/blocks/workshop-calorie-counter.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "dashedName": "workshop-calorie-counter",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/workshop-castle.json b/curriculum/structure/blocks/workshop-castle.json
index 25b2d04c3fc..3b5dd34b477 100644
--- a/curriculum/structure/blocks/workshop-castle.json
+++ b/curriculum/structure/blocks/workshop-castle.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Castle",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": false,
diff --git a/curriculum/structure/blocks/workshop-cat-painting.json b/curriculum/structure/blocks/workshop-cat-painting.json
index bfc32c0f1f4..b5964e15b4d 100644
--- a/curriculum/structure/blocks/workshop-cat-painting.json
+++ b/curriculum/structure/blocks/workshop-cat-painting.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Cat Painting",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-cat-photo-app.json b/curriculum/structure/blocks/workshop-cat-photo-app.json
index af6ea777c4b..3fdd53bd71b 100644
--- a/curriculum/structure/blocks/workshop-cat-photo-app.json
+++ b/curriculum/structure/blocks/workshop-cat-photo-app.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Cat Photo App",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-city-skyline.json b/curriculum/structure/blocks/workshop-city-skyline.json
index a39c2059213..c4e3bbf36bb 100644
--- a/curriculum/structure/blocks/workshop-city-skyline.json
+++ b/curriculum/structure/blocks/workshop-city-skyline.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a City Skyline",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-colored-markers.json b/curriculum/structure/blocks/workshop-colored-markers.json
index 0540489f99c..81fb46f3ddd 100644
--- a/curriculum/structure/blocks/workshop-colored-markers.json
+++ b/curriculum/structure/blocks/workshop-colored-markers.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Set of Colored Markers",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
diff --git a/curriculum/structure/blocks/workshop-curriculum-outline.json b/curriculum/structure/blocks/workshop-curriculum-outline.json
index 36fd3a597fe..93f01539a92 100644
--- a/curriculum/structure/blocks/workshop-curriculum-outline.json
+++ b/curriculum/structure/blocks/workshop-curriculum-outline.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "dashedName": "workshop-curriculum-outline",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/workshop-database-of-video-game-characters.json b/curriculum/structure/blocks/workshop-database-of-video-game-characters.json
index 356bf1a2bf0..7c4b26b618d 100644
--- a/curriculum/structure/blocks/workshop-database-of-video-game-characters.json
+++ b/curriculum/structure/blocks/workshop-database-of-video-game-characters.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Database of Video Game Characters",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": false,
diff --git a/curriculum/structure/blocks/workshop-debug-coding-journey-blog-page.json b/curriculum/structure/blocks/workshop-debug-coding-journey-blog-page.json
index cc32570853c..a3c302abc32 100644
--- a/curriculum/structure/blocks/workshop-debug-coding-journey-blog-page.json
+++ b/curriculum/structure/blocks/workshop-debug-coding-journey-blog-page.json
@@ -2,7 +2,7 @@
   "name": "Debug a Coding Journey Blog Page",
   "dashedName": "workshop-debug-coding-journey-blog-page",
   "helpCategory": "HTML-CSS",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "challengeOrder": [
     { "id": "68c2fb153760d075321c5da3", "title": "Step 1" },
diff --git a/curriculum/structure/blocks/workshop-decimal-to-binary-converter.json b/curriculum/structure/blocks/workshop-decimal-to-binary-converter.json
index f1b8ba55c46..ee41bd1a867 100644
--- a/curriculum/structure/blocks/workshop-decimal-to-binary-converter.json
+++ b/curriculum/structure/blocks/workshop-decimal-to-binary-converter.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Decimal to Binary Converter",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-email-simulator.json b/curriculum/structure/blocks/workshop-email-simulator.json
index b249ff9877e..606756deaba 100644
--- a/curriculum/structure/blocks/workshop-email-simulator.json
+++ b/curriculum/structure/blocks/workshop-email-simulator.json
@@ -4,7 +4,7 @@
   "dashedName": "workshop-email-simulator",
   "helpCategory": "Python",
   "blockLayout": "challenge-grid",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "challengeOrder": [
     { "id": "6852ea0c3cadb54e897acdac", "title": "Step 1" },
     { "id": "6852ef95ccc27660275692cd", "title": "Step 2" },
diff --git a/curriculum/structure/blocks/workshop-emoji-reactor.json b/curriculum/structure/blocks/workshop-emoji-reactor.json
index 1ab9bd132a6..9934e9c828f 100644
--- a/curriculum/structure/blocks/workshop-emoji-reactor.json
+++ b/curriculum/structure/blocks/workshop-emoji-reactor.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an Emoji Reactor",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "dashedName": "workshop-emoji-reactor",
diff --git a/curriculum/structure/blocks/workshop-error-message-component.json b/curriculum/structure/blocks/workshop-error-message-component.json
index e197697a94c..18cda572be0 100644
--- a/curriculum/structure/blocks/workshop-error-message-component.json
+++ b/curriculum/structure/blocks/workshop-error-message-component.json
@@ -1,7 +1,7 @@
 {
   "name": "Build an Error Message Component",
   "isUpcomingChange": false,
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
diff --git a/curriculum/structure/blocks/workshop-fcc-authors-page.json b/curriculum/structure/blocks/workshop-fcc-authors-page.json
index ef1d165380a..d6876a85c43 100644
--- a/curriculum/structure/blocks/workshop-fcc-authors-page.json
+++ b/curriculum/structure/blocks/workshop-fcc-authors-page.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an fCC Authors Page",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-ferris-wheel.json b/curriculum/structure/blocks/workshop-ferris-wheel.json
index 25fdf7cc5fb..263c04ea97b 100644
--- a/curriculum/structure/blocks/workshop-ferris-wheel.json
+++ b/curriculum/structure/blocks/workshop-ferris-wheel.json
@@ -4,7 +4,7 @@
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
   "dashedName": "workshop-ferris-wheel",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/workshop-final-exams-table.json b/curriculum/structure/blocks/workshop-final-exams-table.json
index e74b2018ff3..4aae44aa787 100644
--- a/curriculum/structure/blocks/workshop-final-exams-table.json
+++ b/curriculum/structure/blocks/workshop-final-exams-table.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Final Exams Table",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-flappy-penguin.json b/curriculum/structure/blocks/workshop-flappy-penguin.json
index 2cfde49c93a..238bd721fa1 100644
--- a/curriculum/structure/blocks/workshop-flappy-penguin.json
+++ b/curriculum/structure/blocks/workshop-flappy-penguin.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Flappy Penguin",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-flexbox-photo-gallery.json b/curriculum/structure/blocks/workshop-flexbox-photo-gallery.json
index 0c6794900ef..e231c37da31 100644
--- a/curriculum/structure/blocks/workshop-flexbox-photo-gallery.json
+++ b/curriculum/structure/blocks/workshop-flexbox-photo-gallery.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Flexbox Photo Gallery",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-fruit-search-app.json b/curriculum/structure/blocks/workshop-fruit-search-app.json
index cd12e625492..46ef7f87d87 100644
--- a/curriculum/structure/blocks/workshop-fruit-search-app.json
+++ b/curriculum/structure/blocks/workshop-fruit-search-app.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Fruit Search App",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-greeting-bot.json b/curriculum/structure/blocks/workshop-greeting-bot.json
index 362839b9413..37898263b89 100644
--- a/curriculum/structure/blocks/workshop-greeting-bot.json
+++ b/curriculum/structure/blocks/workshop-greeting-bot.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Greeting Bot",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-greeting-card.json b/curriculum/structure/blocks/workshop-greeting-card.json
index a091e4faf9a..debc77c53f7 100644
--- a/curriculum/structure/blocks/workshop-greeting-card.json
+++ b/curriculum/structure/blocks/workshop-greeting-card.json
@@ -116,5 +116,5 @@
   ],
   "helpCategory": "HTML-CSS",
   "blockLayout": "challenge-grid",
-  "blockType": "workshop"
+  "blockLabel": "workshop"
 }
diff --git a/curriculum/structure/blocks/workshop-hotel-feedback-form.json b/curriculum/structure/blocks/workshop-hotel-feedback-form.json
index c039810f16e..61a6dfd2fb1 100644
--- a/curriculum/structure/blocks/workshop-hotel-feedback-form.json
+++ b/curriculum/structure/blocks/workshop-hotel-feedback-form.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Hotel Feedback Form",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-kitty-ipsum-translator.json b/curriculum/structure/blocks/workshop-kitty-ipsum-translator.json
index 69f637e4198..93da0223e2d 100644
--- a/curriculum/structure/blocks/workshop-kitty-ipsum-translator.json
+++ b/curriculum/structure/blocks/workshop-kitty-ipsum-translator.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Kitty Ipsum Translator",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": false,
diff --git a/curriculum/structure/blocks/workshop-library-manager.json b/curriculum/structure/blocks/workshop-library-manager.json
index 16aa28c8723..25afd63c4ab 100644
--- a/curriculum/structure/blocks/workshop-library-manager.json
+++ b/curriculum/structure/blocks/workshop-library-manager.json
@@ -80,5 +80,5 @@
     }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "workshop"
+  "blockLabel": "workshop"
 }
diff --git a/curriculum/structure/blocks/workshop-linked-list-class.json b/curriculum/structure/blocks/workshop-linked-list-class.json
index ba9415943ee..32e6f09e9ea 100644
--- a/curriculum/structure/blocks/workshop-linked-list-class.json
+++ b/curriculum/structure/blocks/workshop-linked-list-class.json
@@ -6,7 +6,7 @@
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
   "blockLayout": "challenge-grid",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "challengeOrder": [
     { "id": "687d7deea6a2a22fa8816a73", "title": "Step 1" },
     { "id": "687d8c6f066877768f7ee441", "title": "Step 2" },
diff --git a/curriculum/structure/blocks/workshop-loan-qualification-checker.json b/curriculum/structure/blocks/workshop-loan-qualification-checker.json
index ae701976660..3eb3eb9bb01 100644
--- a/curriculum/structure/blocks/workshop-loan-qualification-checker.json
+++ b/curriculum/structure/blocks/workshop-loan-qualification-checker.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Loan Qualification Checker",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-magazine.json b/curriculum/structure/blocks/workshop-magazine.json
index 11b69d09f08..c9a79344524 100644
--- a/curriculum/structure/blocks/workshop-magazine.json
+++ b/curriculum/structure/blocks/workshop-magazine.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Magazine",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-mathbot.json b/curriculum/structure/blocks/workshop-mathbot.json
index e7a1179fa60..8dc360eeac4 100644
--- a/curriculum/structure/blocks/workshop-mathbot.json
+++ b/curriculum/structure/blocks/workshop-mathbot.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Mathbot",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-media-catalogue.json b/curriculum/structure/blocks/workshop-media-catalogue.json
index 4e701c9f5df..01e019a7343 100644
--- a/curriculum/structure/blocks/workshop-media-catalogue.json
+++ b/curriculum/structure/blocks/workshop-media-catalogue.json
@@ -6,7 +6,7 @@
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
   "blockLayout": "challenge-grid",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "challengeOrder": [
     { "id": "68af272f60e009597dd861e1", "title": "Step 1" },
     { "id": "68af273960e009597dd861e2", "title": "Step 2" },
diff --git a/curriculum/structure/blocks/workshop-medical-data-validator.json b/curriculum/structure/blocks/workshop-medical-data-validator.json
index 884915ba98d..49bcf412b4d 100644
--- a/curriculum/structure/blocks/workshop-medical-data-validator.json
+++ b/curriculum/structure/blocks/workshop-medical-data-validator.json
@@ -4,7 +4,7 @@
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
   "dashedName": "workshop-medical-data-validator",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/workshop-merge-sort.json b/curriculum/structure/blocks/workshop-merge-sort.json
index 74cb28df643..e39c3bbca7b 100644
--- a/curriculum/structure/blocks/workshop-merge-sort.json
+++ b/curriculum/structure/blocks/workshop-merge-sort.json
@@ -1,7 +1,7 @@
 {
   "name": "Implement the Merge Sort Algorithm",
   "blockLayout": "challenge-grid",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "isUpcomingChange": true,
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
diff --git a/curriculum/structure/blocks/workshop-music-instrument-filter.json b/curriculum/structure/blocks/workshop-music-instrument-filter.json
index 95f0206e036..bc11ffd7da7 100644
--- a/curriculum/structure/blocks/workshop-music-instrument-filter.json
+++ b/curriculum/structure/blocks/workshop-music-instrument-filter.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Music Instrument Filter",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-music-player.json b/curriculum/structure/blocks/workshop-music-player.json
index 3d9272bb992..520bf7ecf45 100644
--- a/curriculum/structure/blocks/workshop-music-player.json
+++ b/curriculum/structure/blocks/workshop-music-player.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Music Player",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-musical-instrument-inventory.json b/curriculum/structure/blocks/workshop-musical-instrument-inventory.json
index f6f75202d4b..8f983c33209 100644
--- a/curriculum/structure/blocks/workshop-musical-instrument-inventory.json
+++ b/curriculum/structure/blocks/workshop-musical-instrument-inventory.json
@@ -60,5 +60,5 @@
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
   "blockLayout": "challenge-grid",
-  "blockType": "workshop"
+  "blockLabel": "workshop"
 }
diff --git a/curriculum/structure/blocks/workshop-note-taking-app.json b/curriculum/structure/blocks/workshop-note-taking-app.json
index 40679fd5c42..cf9e427ce3b 100644
--- a/curriculum/structure/blocks/workshop-note-taking-app.json
+++ b/curriculum/structure/blocks/workshop-note-taking-app.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Note Taking App",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "dashedName": "workshop-note-taking-app",
diff --git a/curriculum/structure/blocks/workshop-nutritional-label.json b/curriculum/structure/blocks/workshop-nutritional-label.json
index cf3208ffc7a..eaa060aac46 100644
--- a/curriculum/structure/blocks/workshop-nutritional-label.json
+++ b/curriculum/structure/blocks/workshop-nutritional-label.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Nutritional Label",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-piano.json b/curriculum/structure/blocks/workshop-piano.json
index f66881924af..32fee4955a2 100644
--- a/curriculum/structure/blocks/workshop-piano.json
+++ b/curriculum/structure/blocks/workshop-piano.json
@@ -1,6 +1,6 @@
 {
   "name": "Design a Piano",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-pin-extractor.json b/curriculum/structure/blocks/workshop-pin-extractor.json
index 4e732960dbf..13ee17f501d 100644
--- a/curriculum/structure/blocks/workshop-pin-extractor.json
+++ b/curriculum/structure/blocks/workshop-pin-extractor.json
@@ -1,7 +1,7 @@
 {
   "name": "Build a Pin Extractor",
   "blockLayout": "challenge-grid",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "isUpcomingChange": false,
   "dashedName": "workshop-pin-extractor",
   "helpCategory": "Python",
diff --git a/curriculum/structure/blocks/workshop-planets-tablist.json b/curriculum/structure/blocks/workshop-planets-tablist.json
index 970eb82bd52..4aa69e2ee38 100644
--- a/curriculum/structure/blocks/workshop-planets-tablist.json
+++ b/curriculum/structure/blocks/workshop-planets-tablist.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Planets Tablist",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "dashedName": "workshop-planets-tablist",
diff --git a/curriculum/structure/blocks/workshop-plant-nursery-catalog.json b/curriculum/structure/blocks/workshop-plant-nursery-catalog.json
index 4de5a1890a7..602bc13785a 100644
--- a/curriculum/structure/blocks/workshop-plant-nursery-catalog.json
+++ b/curriculum/structure/blocks/workshop-plant-nursery-catalog.json
@@ -4,7 +4,7 @@
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
   "dashedName": "workshop-plant-nursery-catalog",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/workshop-recipe-ingredient-converter.json b/curriculum/structure/blocks/workshop-recipe-ingredient-converter.json
index bcbc22eea7e..ea5492fdbf1 100644
--- a/curriculum/structure/blocks/workshop-recipe-ingredient-converter.json
+++ b/curriculum/structure/blocks/workshop-recipe-ingredient-converter.json
@@ -80,5 +80,5 @@
     }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "workshop"
+  "blockLabel": "workshop"
 }
diff --git a/curriculum/structure/blocks/workshop-recipe-tracker.json b/curriculum/structure/blocks/workshop-recipe-tracker.json
index 9103f878657..6dc2bddab8c 100644
--- a/curriculum/structure/blocks/workshop-recipe-tracker.json
+++ b/curriculum/structure/blocks/workshop-recipe-tracker.json
@@ -60,5 +60,5 @@
     }
   ],
   "helpCategory": "JavaScript",
-  "blockType": "workshop"
+  "blockLabel": "workshop"
 }
diff --git a/curriculum/structure/blocks/workshop-registration-form.json b/curriculum/structure/blocks/workshop-registration-form.json
index f85595f0ae9..385d5160467 100644
--- a/curriculum/structure/blocks/workshop-registration-form.json
+++ b/curriculum/structure/blocks/workshop-registration-form.json
@@ -1,6 +1,6 @@
 {
   "name": "Design a Registration Form",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-reusable-mega-navbar.json b/curriculum/structure/blocks/workshop-reusable-mega-navbar.json
index bc23e69703a..10e420ba5cc 100644
--- a/curriculum/structure/blocks/workshop-reusable-mega-navbar.json
+++ b/curriculum/structure/blocks/workshop-reusable-mega-navbar.json
@@ -1,7 +1,7 @@
 {
   "name": "Build a Reusable Mega Navbar",
   "isUpcomingChange": false,
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
diff --git a/curriculum/structure/blocks/workshop-reusable-profile-card-component.json b/curriculum/structure/blocks/workshop-reusable-profile-card-component.json
index ecfcfbfa129..369e94f6d47 100644
--- a/curriculum/structure/blocks/workshop-reusable-profile-card-component.json
+++ b/curriculum/structure/blocks/workshop-reusable-profile-card-component.json
@@ -1,7 +1,7 @@
 {
   "name": "Build a Reusable Profile Card Component",
   "isUpcomingChange": false,
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
diff --git a/curriculum/structure/blocks/workshop-rothko-painting.json b/curriculum/structure/blocks/workshop-rothko-painting.json
index c7f170758d8..d158a6c8a44 100644
--- a/curriculum/structure/blocks/workshop-rothko-painting.json
+++ b/curriculum/structure/blocks/workshop-rothko-painting.json
@@ -1,6 +1,6 @@
 {
   "name": "Design a Rothko Painting",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-rps-game.json b/curriculum/structure/blocks/workshop-rps-game.json
index af0a1238437..248f2065b32 100644
--- a/curriculum/structure/blocks/workshop-rps-game.json
+++ b/curriculum/structure/blocks/workshop-rps-game.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Rock, Paper, Scissors Game",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-salary-tracker.json b/curriculum/structure/blocks/workshop-salary-tracker.json
index c132f96a4c8..73a822b6c24 100644
--- a/curriculum/structure/blocks/workshop-salary-tracker.json
+++ b/curriculum/structure/blocks/workshop-salary-tracker.json
@@ -4,7 +4,7 @@
   "dashedName": "workshop-salary-tracker",
   "helpCategory": "Python",
   "blockLayout": "challenge-grid",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "challengeOrder": [
     { "id": "68c15a2a1f0e70ca7154aba5", "title": "Step 1" },
     { "id": "68c16924498728d259e4781c", "title": "Step 2" },
diff --git a/curriculum/structure/blocks/workshop-sentence-analyzer.json b/curriculum/structure/blocks/workshop-sentence-analyzer.json
index 53d7f8fbd9a..986754de28b 100644
--- a/curriculum/structure/blocks/workshop-sentence-analyzer.json
+++ b/curriculum/structure/blocks/workshop-sentence-analyzer.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Sentence Analyzer",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-shopping-cart.json b/curriculum/structure/blocks/workshop-shopping-cart.json
index 87b41ced590..91cef6dc9b5 100644
--- a/curriculum/structure/blocks/workshop-shopping-cart.json
+++ b/curriculum/structure/blocks/workshop-shopping-cart.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Shopping Cart",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-shopping-list-app.json b/curriculum/structure/blocks/workshop-shopping-list-app.json
index 79694a5a0be..857302a3aaf 100644
--- a/curriculum/structure/blocks/workshop-shopping-list-app.json
+++ b/curriculum/structure/blocks/workshop-shopping-list-app.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Shopping List App",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-shopping-list.json b/curriculum/structure/blocks/workshop-shopping-list.json
index 8fb85ee8c71..aa4e13933cf 100644
--- a/curriculum/structure/blocks/workshop-shopping-list.json
+++ b/curriculum/structure/blocks/workshop-shopping-list.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Shopping List",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-spam-filter.json b/curriculum/structure/blocks/workshop-spam-filter.json
index 673581b524b..bdc904dcba6 100644
--- a/curriculum/structure/blocks/workshop-spam-filter.json
+++ b/curriculum/structure/blocks/workshop-spam-filter.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Spam Filter",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-sql-reference-object.json b/curriculum/structure/blocks/workshop-sql-reference-object.json
index af690bab235..28d564d4f32 100644
--- a/curriculum/structure/blocks/workshop-sql-reference-object.json
+++ b/curriculum/structure/blocks/workshop-sql-reference-object.json
@@ -1,6 +1,6 @@
 {
   "name": "Build an SQL Reference Object",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": false,
diff --git a/curriculum/structure/blocks/workshop-sql-student-database-part-1.json b/curriculum/structure/blocks/workshop-sql-student-database-part-1.json
index 23c52d3b0f1..4a1a75ab4d4 100644
--- a/curriculum/structure/blocks/workshop-sql-student-database-part-1.json
+++ b/curriculum/structure/blocks/workshop-sql-student-database-part-1.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Student Database: Part 1",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": false,
diff --git a/curriculum/structure/blocks/workshop-sql-student-database-part-2.json b/curriculum/structure/blocks/workshop-sql-student-database-part-2.json
index a8cac6f5f44..8907b07ba0b 100644
--- a/curriculum/structure/blocks/workshop-sql-student-database-part-2.json
+++ b/curriculum/structure/blocks/workshop-sql-student-database-part-2.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Student Database: Part 2",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "link",
   "isUpcomingChange": false,
   "usesMultifileEditor": false,
diff --git a/curriculum/structure/blocks/workshop-storytelling-app.json b/curriculum/structure/blocks/workshop-storytelling-app.json
index af031a0f329..156170944fe 100644
--- a/curriculum/structure/blocks/workshop-storytelling-app.json
+++ b/curriculum/structure/blocks/workshop-storytelling-app.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "dashedName": "workshop-storytelling-app",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/workshop-string-transformer.json b/curriculum/structure/blocks/workshop-string-transformer.json
index fdc6569c9b3..4c20ffb9ecd 100644
--- a/curriculum/structure/blocks/workshop-string-transformer.json
+++ b/curriculum/structure/blocks/workshop-string-transformer.json
@@ -17,7 +17,7 @@
     { "id": "68e44abea678a65b877864dc", "title": "Step 10" },
     { "id": "68e44c305f1f935d949d76bb", "title": "Step 11" }
   ],
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true
 }
diff --git a/curriculum/structure/blocks/workshop-superhero-application-form.json b/curriculum/structure/blocks/workshop-superhero-application-form.json
index d933cbadb20..9a9e719caef 100644
--- a/curriculum/structure/blocks/workshop-superhero-application-form.json
+++ b/curriculum/structure/blocks/workshop-superhero-application-form.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
   "hasEditableBoundaries": true,
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "dashedName": "workshop-superhero-application-form",
   "challengeOrder": [
diff --git a/curriculum/structure/blocks/workshop-tailwind-cta-component.json b/curriculum/structure/blocks/workshop-tailwind-cta-component.json
index f929328b908..ee9890ff200 100644
--- a/curriculum/structure/blocks/workshop-tailwind-cta-component.json
+++ b/curriculum/structure/blocks/workshop-tailwind-cta-component.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": false,
   "dashedName": "workshop-tailwind-cta-component",
   "helpCategory": "HTML-CSS",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/workshop-tailwind-pricing-component.json b/curriculum/structure/blocks/workshop-tailwind-pricing-component.json
index 11154f10755..a866d5477a2 100644
--- a/curriculum/structure/blocks/workshop-tailwind-pricing-component.json
+++ b/curriculum/structure/blocks/workshop-tailwind-pricing-component.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": false,
   "dashedName": "workshop-tailwind-pricing-component",
   "helpCategory": "HTML-CSS",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "challengeOrder": [
     {
diff --git a/curriculum/structure/blocks/workshop-teacher-chatbot.json b/curriculum/structure/blocks/workshop-teacher-chatbot.json
index d03aaa57825..3e10820bb2e 100644
--- a/curriculum/structure/blocks/workshop-teacher-chatbot.json
+++ b/curriculum/structure/blocks/workshop-teacher-chatbot.json
@@ -1,6 +1,6 @@
 {
   "name": "Build a Teacher Chatbot",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/curriculum/structure/blocks/workshop-tech-conference-schedule.json b/curriculum/structure/blocks/workshop-tech-conference-schedule.json
index 98facff707e..1a45017bcf4 100644
--- a/curriculum/structure/blocks/workshop-tech-conference-schedule.json
+++ b/curriculum/structure/blocks/workshop-tech-conference-schedule.json
@@ -3,7 +3,7 @@
   "isUpcomingChange": false,
   "dashedName": "workshop-tech-conference-schedule",
   "helpCategory": "HTML-CSS",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "challengeOrder": [
     { "id": "68c33e502cd97f2fd52cb63b", "title": "Step 1" },
diff --git a/curriculum/structure/blocks/workshop-todo-app.json b/curriculum/structure/blocks/workshop-todo-app.json
index aec23c2b1d6..abeb2844ba7 100644
--- a/curriculum/structure/blocks/workshop-todo-app.json
+++ b/curriculum/structure/blocks/workshop-todo-app.json
@@ -5,7 +5,7 @@
   "hasEditableBoundaries": true,
   "dashedName": "workshop-todo-app",
   "blockLayout": "challenge-grid",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "challengeOrder": [
     {
       "id": "64e4e4c4ec263b62ae7bf54d",
diff --git a/curriculum/structure/blocks/workshop-toggle-text-app.json b/curriculum/structure/blocks/workshop-toggle-text-app.json
index fdd3caf8587..2bcd5c9d65c 100644
--- a/curriculum/structure/blocks/workshop-toggle-text-app.json
+++ b/curriculum/structure/blocks/workshop-toggle-text-app.json
@@ -1,6 +1,6 @@
 {
   "name": "Toggle Text App",
-  "blockType": "workshop",
+  "blockLabel": "workshop",
   "blockLayout": "challenge-grid",
   "isUpcomingChange": false,
   "usesMultifileEditor": true,
diff --git a/shared/config/blocks.ts b/shared/config/blocks.ts
index 70c3c568dc0..b3459183465 100644
--- a/shared/config/blocks.ts
+++ b/shared/config/blocks.ts
@@ -1,4 +1,4 @@
-export enum BlockTypes {
+export enum BlockLabel {
   lecture = 'lecture',
   workshop = 'workshop',
   lab = 'lab',
diff --git a/tools/challenge-helper-scripts/create-language-block.ts b/tools/challenge-helper-scripts/create-language-block.ts
index 50ebf9bbd59..a6c2e9de766 100644
--- a/tools/challenge-helper-scripts/create-language-block.ts
+++ b/tools/challenge-helper-scripts/create-language-block.ts
@@ -10,7 +10,7 @@ import {
   languageSuperBlocks,
   chapterBasedSuperBlocks
 } from '../../shared/config/curriculum';
-import { BlockLayouts, BlockTypes } from '../../shared/config/blocks';
+import { BlockLayouts, BlockLabel } from '../../shared/config/blocks';
 import {
   getContentConfig,
   writeBlockStructure,
@@ -51,7 +51,7 @@ interface CreateBlockArgs {
   chapter?: string;
   module?: string;
   position?: number;
-  blockType?: string;
+  blockLabel?: string;
   blockLayout?: string;
   questionCount?: number;
 }
@@ -64,7 +64,7 @@ async function createLanguageBlock(
   chapter?: string,
   module?: string,
   position?: number,
-  blockType?: string,
+  blockLabel?: string,
   blockLayout?: string,
   questionCount?: number
 ) {
@@ -75,7 +75,7 @@ async function createLanguageBlock(
 
   let challengeId: ObjectID;
 
-  if (blockType === BlockTypes.quiz) {
+  if (blockLabel === BlockLabel.quiz) {
     challengeId = await createQuizChallenge(block, title, questionCount!);
     blockLayout = BlockLayouts.Link;
   } else {
@@ -87,7 +87,7 @@ async function createLanguageBlock(
     title,
     helpCategory,
     challengeId,
-    blockType,
+    blockLabel,
     blockLayout
   );
 
@@ -142,7 +142,7 @@ async function createMetaJson(
   title: string,
   helpCategory: string,
   challengeId: ObjectID,
-  blockType?: string,
+  blockLabel?: string,
   blockLayout?: string
 ) {
   const newMeta = getBaseMeta('Language');
@@ -150,15 +150,15 @@ async function createMetaJson(
   newMeta.dashedName = block;
   newMeta.helpCategory = helpCategory;
 
-  if (blockType) {
-    newMeta.blockType = blockType;
+  if (blockLabel) {
+    newMeta.blockLabel = blockLabel;
   }
   if (blockLayout) {
     newMeta.blockLayout = blockLayout;
   }
 
   const challengeTitle =
-    blockType === BlockTypes.quiz ? title : "Dialogue 1: I'm Tom";
+    blockLabel === BlockLabel.quiz ? title : "Dialogue 1: I'm Tom";
 
   newMeta.challengeOrder = [
     {
@@ -257,11 +257,11 @@ void getAllBlocks()
         choices: helpCategories
       },
       {
-        name: 'blockType',
-        message: 'Choose a block type',
-        default: BlockTypes.learn,
+        name: 'blockLabel',
+        message: 'Choose a block label',
+        default: BlockLabel.learn,
         type: 'list',
-        choices: Object.values(BlockTypes),
+        choices: Object.values(BlockLabel),
         when: (answers: CreateBlockArgs) =>
           chapterBasedSuperBlocks.includes(answers.superBlock)
       },
@@ -273,7 +273,7 @@ void getAllBlocks()
         choices: Object.values(BlockLayouts),
         when: (answers: CreateBlockArgs) =>
           chapterBasedSuperBlocks.includes(answers.superBlock) &&
-          answers.blockType !== BlockTypes.quiz
+          answers.blockLabel !== BlockLabel.quiz
       },
       {
         name: 'questionCount',
@@ -282,7 +282,7 @@ void getAllBlocks()
         type: 'list',
         choices: [10, 20],
         when: (answers: CreateBlockArgs) =>
-          answers.blockType === BlockTypes.quiz
+          answers.blockLabel === BlockLabel.quiz
       },
       {
         name: 'chapter',
@@ -352,7 +352,7 @@ void getAllBlocks()
       chapter,
       module,
       position,
-      blockType,
+      blockLabel,
       blockLayout,
       questionCount
     }: CreateBlockArgs) =>
@@ -364,7 +364,7 @@ void getAllBlocks()
         chapter,
         module,
         position,
-        blockType,
+        blockLabel,
         blockLayout,
         questionCount
       )
diff --git a/tools/challenge-helper-scripts/create-project.ts b/tools/challenge-helper-scripts/create-project.ts
index 5fa30a66deb..d7b0b15d66d 100644
--- a/tools/challenge-helper-scripts/create-project.ts
+++ b/tools/challenge-helper-scripts/create-project.ts
@@ -9,7 +9,7 @@ import {
   SuperBlocks,
   chapterBasedSuperBlocks
 } from '../../shared/config/curriculum';
-import { BlockLayouts, BlockTypes } from '../../shared/config/blocks';
+import { BlockLayouts, BlockLabel } from '../../shared/config/blocks';
 import {
   getContentConfig,
   writeBlockStructure
@@ -55,7 +55,7 @@ interface CreateProjectArgs {
   superBlock: SuperBlocks;
   block: string;
   helpCategory: string;
-  blockType?: string;
+  blockLabel?: string;
   blockLayout?: string;
   questionCount?: number;
   order?: number;
@@ -107,7 +107,7 @@ async function createProject(projectArgs: CreateProjectArgs) {
     projectArgs.title
   );
 
-  if (projectArgs.blockType === BlockTypes.quiz) {
+  if (projectArgs.blockLabel === BlockLabel.quiz) {
     if (projectArgs.questionCount == null) {
       throw new Error(
         'Property `questionCount` is null when creating new Quiz Challenge'
@@ -134,7 +134,7 @@ async function createProject(projectArgs: CreateProjectArgs) {
       projectArgs.helpCategory,
       challengeId,
       projectArgs.order,
-      projectArgs.blockType,
+      projectArgs.blockLabel,
       projectArgs.blockLayout
     );
     // TODO: remove once we stop relying on markdown in the client.
@@ -142,9 +142,11 @@ async function createProject(projectArgs: CreateProjectArgs) {
 
   if (
     (chapterBasedSuperBlocks.includes(projectArgs.superBlock) &&
-      projectArgs.blockType) == null
+      projectArgs.blockLabel) == null
   ) {
-    throw new Error('Missing argument: blockType when updating intro markdown');
+    throw new Error(
+      'Missing argument: blockLabel when updating intro markdown'
+    );
   }
 
   void createIntroMD(
@@ -182,15 +184,15 @@ async function createMetaJson(
   helpCategory: string,
   challengeId: ObjectID,
   order?: number,
-  blockType?: string,
+  blockLabel?: string,
   blockLayout?: string
 ) {
   let newMeta;
   if (chapterBasedSuperBlocks.includes(superBlock)) {
     newMeta = getBaseMeta('FullStack');
-    newMeta.blockType = blockType;
+    newMeta.blockLabel = blockLabel;
     newMeta.blockLayout = blockLayout;
-    if (blockType === BlockTypes.workshop) {
+    if (blockLabel === BlockLabel.workshop) {
       newMeta.hasEditableBoundaries = true;
     }
   } else {
@@ -328,11 +330,11 @@ void getAllBlocks()
         choices: helpCategories
       },
       {
-        name: 'blockType',
-        message: 'Choose a block type',
-        default: BlockTypes.lab,
+        name: 'blockLabel',
+        message: 'Choose a block label',
+        default: BlockLabel.lab,
         type: 'list',
-        choices: Object.values(BlockTypes),
+        choices: Object.values(BlockLabel),
         when: (answers: CreateProjectArgs) =>
           chapterBasedSuperBlocks.includes(answers.superBlock)
       },
@@ -340,8 +342,8 @@ void getAllBlocks()
         name: 'blockLayout',
         message: 'Choose a block layout',
 
-        default: (answers: { blockType: BlockTypes }) =>
-          answers.blockType == BlockTypes.quiz
+        default: (answers: { blockLabel: BlockLabel }) =>
+          answers.blockLabel == BlockLabel.quiz
             ? BlockLayouts.Link
             : BlockLayouts.ChallengeList,
         type: 'list',
@@ -356,7 +358,7 @@ void getAllBlocks()
         type: 'list',
         choices: [10, 20],
         when: (answers: CreateProjectArgs) =>
-          answers.blockType === BlockTypes.quiz
+          answers.blockLabel === BlockLabel.quiz
       },
       {
         name: 'chapter',
@@ -421,7 +423,7 @@ void getAllBlocks()
         block,
         title,
         helpCategory,
-        blockType,
+        blockLabel,
         blockLayout,
         questionCount,
         chapter,
@@ -433,7 +435,7 @@ void getAllBlocks()
           superBlock,
           block,
           helpCategory,
-          blockType,
+          blockLabel,
           blockLayout,
           questionCount,
           title,
diff --git a/tools/challenge-helper-scripts/helpers/get-base-meta.ts b/tools/challenge-helper-scripts/helpers/get-base-meta.ts
index 3dd8634bbfc..3ff1251edde 100644
--- a/tools/challenge-helper-scripts/helpers/get-base-meta.ts
+++ b/tools/challenge-helper-scripts/helpers/get-base-meta.ts
@@ -9,7 +9,7 @@ interface Meta {
   }>;
   usesMultifileEditor?: boolean;
   hasEditableBoundaries?: boolean;
-  blockType?: string;
+  blockLabel?: string;
   blockLayout?: string;
   order?: number;
 }
@@ -36,14 +36,14 @@ const stepMeta = {
 
 const fullStackStepMeta = {
   ...baseMeta,
-  blockType: '',
+  blockLabel: '',
   blockLayout: '',
   usesMultifileEditor: true
 };
 
 const quizMeta = {
   ...baseMeta,
-  blockType: 'quiz',
+  blockLabel: 'quiz',
   blockLayout: 'link'
 };
 
diff --git a/tools/challenge-helper-scripts/helpers/project-metadata.ts b/tools/challenge-helper-scripts/helpers/project-metadata.ts
index 84fcd786349..201d3e148a7 100644
--- a/tools/challenge-helper-scripts/helpers/project-metadata.ts
+++ b/tools/challenge-helper-scripts/helpers/project-metadata.ts
@@ -8,7 +8,7 @@ import { getProjectPath } from './get-project-info';
 export type Meta = {
   name: string;
   blockLayout: string;
-  blockType: string;
+  blockLabel: string;
   isUpcomingChange: boolean;
   dashedName: string;
   helpCategory: string;
diff --git a/tools/scripts/build/build-external-curricula-data-v1.ts b/tools/scripts/build/build-external-curricula-data-v1.ts
index 4d79ba46752..39a8436d4d4 100644
--- a/tools/scripts/build/build-external-curricula-data-v1.ts
+++ b/tools/scripts/build/build-external-curricula-data-v1.ts
@@ -4,6 +4,7 @@ import { omit } from 'lodash';
 import { submitTypes } from '../../../shared-dist/config/challenge-types';
 import { type ChallengeNode } from '../../../client/src/redux/prop-types';
 import { SuperBlocks } from '../../../shared-dist/config/curriculum';
+import { patchBlock } from './patches';
 
 export type CurriculumIntros = {
   [keyValue in SuperBlocks]: {
@@ -121,10 +122,13 @@ export function buildExtCurriculumDataV1(
 
         superBlock[superBlockKey]['blocks'][blockName]['desc'] = block['intro'];
 
-        superBlock[superBlockKey]['blocks'][blockName]['challenges'] = omit(
-          curriculum[superBlockKey]['blocks'][blockName]['meta'],
-          ['chapter', 'module']
-        );
+        superBlock[superBlockKey]['blocks'][blockName]['challenges'] =
+          patchBlock(
+            omit(curriculum[superBlockKey]['blocks'][blockName]['meta'], [
+              'chapter',
+              'module'
+            ])
+          );
 
         const blockChallenges =
           curriculum[superBlockKey]['blocks'][blockName]['challenges'];
diff --git a/tools/scripts/build/build-external-curricula-data-v2.ts b/tools/scripts/build/build-external-curricula-data-v2.ts
index 98fd7ce97cd..8ae11926b43 100644
--- a/tools/scripts/build/build-external-curricula-data-v2.ts
+++ b/tools/scripts/build/build-external-curricula-data-v2.ts
@@ -6,6 +6,7 @@ import { type ChallengeNode } from '../../../client/src/redux/prop-types';
 import { SuperBlocks } from '../../../shared-dist/config/curriculum';
 import type { Chapter } from '../../../shared-dist/config/chapters';
 import { getSuperblockStructure } from '../../../curriculum/src/file-handler';
+import { patchBlock } from './patches';
 
 export type CurriculumIntros =
   | BlockBasedCurriculumIntros
@@ -316,7 +317,9 @@ export function buildExtCurriculumDataV2(
                     const blockData = blocksWithData[block];
                     return {
                       intro: superBlockIntros.blocks[block].intro,
-                      meta: omit(blockData.meta, ['chapter', 'module'])
+                      meta: patchBlock(
+                        omit(blockData.meta, ['chapter', 'module'])
+                      )
                     };
                   })
           }))
@@ -339,7 +342,7 @@ export function buildExtCurriculumDataV2(
 
       return {
         intro: intros[superBlockKey].blocks[blockName].intro,
-        meta: blockData.meta
+        meta: patchBlock(blockData.meta)
       };
     });
 
diff --git a/tools/scripts/build/patches.ts b/tools/scripts/build/patches.ts
new file mode 100644
index 00000000000..742f3fe1fdf
--- /dev/null
+++ b/tools/scripts/build/patches.ts
@@ -0,0 +1,7 @@
+export const patchBlock = (meta: Record<string, unknown>) => {
+  const { blockLabel, ...rest } = meta;
+  return {
+    ...rest,
+    blockType: blockLabel
+  };
+};