diff --git a/docs/teachertool.md b/docs/code-eval-tool.md
similarity index 61%
rename from docs/teachertool.md
rename to docs/code-eval-tool.md
index 0db31d91f31..d4803ed376d 100644
--- a/docs/teachertool.md
+++ b/docs/code-eval-tool.md
@@ -2,9 +2,9 @@
 
 ## Overview
 
-The [Teacher Tool]( https://microbit.makecode.com/beta--eval) is a mechanism for constructing a checklist of requirements for an assignment and running that list automatically against projects in quick succession. This allows teachers to build a checklist, then easily evaluate any number of projects based on that checklist. Projects are evaluated one at a time, but with auto-run enabled, you can update the loaded project by providing a new share link, at which point the rules will automatically be re-run on the new project.
+The [Code Evaluation Tool]( https://microbit.makecode.com/beta--eval) is a mechanism for constructing a checklist of requirements for an assignment and running that list automatically against projects in quick succession. This allows teachers to build a checklist, then easily evaluate any number of projects based on that checklist. Projects are evaluated one at a time, but with auto-run enabled, you can update the loaded project by providing a new share link, at which point the rules will automatically be re-run on the new project.
 
-## Teacher Tool Features
+## Code Evaluation Tool Features
 
 ### Creating, Editing, and Running a Checklist
 
@@ -12,25 +12,25 @@ The [Teacher Tool]( https://microbit.makecode.com/beta--eval) is a mechanism for
 
 Create a new checklist using the **New Checklist** card. If there is already an "in progress" checklist, a warning will appear asking if it is okay to overwrite it.
 
-![New Checklist](/static/teachertool/new-rubric.png)
+![New Checklist](/static/code-eval-tool/new-rubric.png)
 
-![New Checklist from menu](/static/teachertool/new-rubric-from-menu.png)
+![New Checklist from menu](/static/code-eval-tool/new-rubric-from-menu.png)
 
 #### 2. Naming a checklist
 
 The checklist is given a name.
 
-![Checklist name](/static/teachertool/checklist-name.png)
+![Checklist name](/static/code-eval-tool/checklist-name.png)
 
 #### 3. Add Criteria
 
 One or more **_criteria_** are added from the catalog using the **Add Criteria** button.
       
-![Add Criteria](/static/teachertool/add-criteria.png)
+![Add Criteria](/static/code-eval-tool/add-criteria.png)
 
 Some criteria (like `[block] used [count] times`) can be added multiple times, others (like `Read a GPIO pin` can only be added once).
 
-![Criteria items](/static/teachertool/criteria-items.png)
+![Criteria items](/static/code-eval-tool/criteria-items.png)
 
 #### 4. Fill in Parameters
 
@@ -51,39 +51,39 @@ From a technical perspective, criteria parameters have these types:
 
 Here a block is selected and used 3 times:
 
-![Criteria parameters 1](/static/teachertool/parameters-1.png)
+![Criteria parameters 1](/static/code-eval-tool/parameters-1.png)
 
 Parameter options are displayed and then selected.
 
-![Criteria parameters 2](/static/teachertool/parameters-2.png)
+![Criteria parameters 2](/static/code-eval-tool/parameters-2.png)
       
-![Criteria parameters 3](/static/teachertool/parameters-3.png)
+![Criteria parameters 3](/static/code-eval-tool/parameters-3.png)
 
 #### 5. Remove Criteria
 
 A criteria item is removed using the **trash** button.
 
-![Remove Criteria](/static/teachertool/remove-criteria.png)
+![Remove Criteria](/static/code-eval-tool/remove-criteria.png)
 
 #### 6. Load a project
 
 A project into the project view by pasting in a share link or share ID.
 
-![A loaded project](/static/teachertool/loaded-project.png)
+![A loaded project](/static/code-eval-tool/loaded-project.png)
 
 The project will load in read-only mode with the project title appearing at the top of the project view.
    
-![Project validation](/static/teachertool/validate-me.png)
+![Project validation](/static/code-eval-tool/validate-me.png)
       
 #### 7. Run the checklist
 
 With a project loaded, the checklist can run. The results are shown after clicking the **Run** button.
 
-![Run checklist](/static/teachertool/run-checklist-button.png)
+![Run checklist](/static/code-eval-tool/run-checklist-button.png)
 
 The results view lists each criteria with its outcome.
 
-![Checklist execution](/static/teachertool/checklist-execution.png)
+![Checklist execution](/static/code-eval-tool/checklist-execution.png)
 
 **Note**: the **Run** Button is disabled without loaded project.
 
@@ -93,21 +93,21 @@ The results view lists each criteria with its outcome.
 
 Feedback and notes are added using the **Add Notes** button. The feedback box should resize to fit its content as notes are added. The original feedback remains even if you re-run the rules using the **Run** button.
 
-![Editing results](/static/teachertool/editing-results-1.png)
+![Editing results](/static/code-eval-tool/editing-results-1.png)
 
-![Editing results](/static/teachertool/editing-results-2.png)
+![Editing results](/static/code-eval-tool/editing-results-2.png)
 
-![Editing results](/static/teachertool/editing-results-3.png)
+![Editing results](/static/code-eval-tool/editing-results-3.png)
 
 #### 2. Edit outcomes
 
 An outcome is edited using the provided dropdown.
       
-![Edit outcome](/static/teachertool/edit-outcome-1.png)
+![Edit outcome](/static/code-eval-tool/edit-outcome-1.png)
 
 The new selected outcome.
 
-![Edit outcome](/static/teachertool/edit-outcome-2.png)
+![Edit outcome](/static/code-eval-tool/edit-outcome-2.png)
       
 ### Result Clearing and Auto-Run
 
@@ -115,7 +115,7 @@ The new selected outcome.
 
 Auto-run is toggled either **on** or **off** using the button in the menu.
       
-![Auto-run button](/static/teachertool/autorun-button.png)
+![Auto-run button](/static/code-eval-tool/autorun-button.png)
 
 #### 2. Auto-run disabled
 
@@ -135,31 +135,31 @@ If auto-run is **enabled**, any rules that enter the "Not started" state due to
 
 There are pre-built checklists are available from on home page. If a selected checklist is already in-progress, an overwrite confirmation prompt is given.
       
-![Pre-built checklists](/static/teachertool/prebuilt-rubrics.png)
+![Pre-built checklists](/static/code-eval-tool/prebuilt-rubrics.png)
       
 #### 2. Export a checklist
 
 A checklist is exported using the vertical "..." menu near the "auto-run" button.
 
-![Export checklist](/static/teachertool/export-checklist.png)
+![Export checklist](/static/code-eval-tool/export-checklist.png)
 
 This will download a json file for the checklist.
 
-![Checklist download](/static/teachertool/checklist-download.png)
+![Checklist download](/static/code-eval-tool/checklist-download.png)
 
 #### 3. Import a checklist
 
 User can import a checklist from a file using the same "..." menu, or from the card on the welcome page.
 
-![Import checklist card](/static/teachertool/import-checklist-card.png)
+![Import checklist card](/static/code-eval-tool/import-checklist-card.png)
 
-![Import checklist menu](/static/teachertool/import-checklist-menu.png)
+![Import checklist menu](/static/code-eval-tool/import-checklist-menu.png)
 
 Checklist file is selected using "Browse" or dropped directly into the popup. An overwrite confirmation prompted if there is currently an in-progress checklist.
 
-![Import checklist drag in](/static/teachertool/import-checklist-dragdrop-1.png)
+![Import checklist drag in](/static/code-eval-tool/import-checklist-dragdrop-1.png)
 
-![Import checklist drop off](/static/teachertool/import-checklist-dragdrop-2.png)
+![Import checklist drop off](/static/code-eval-tool/import-checklist-dragdrop-2.png)
       
 ### Other
 
@@ -167,12 +167,12 @@ If the page is refreshed (or if the browser closes/re-opens), the current checkl
 
 Use the print button to create a version of the results with the outcomes and feedback visible (the other UI elements are hidden).
       
-![Print button](/static/teachertool/print-button.png)
+![Print button](/static/code-eval-tool/print-button.png)
 
 The checklist-view/project-view splitter can be resized. It can also be reset to 50/50 split with double-click.
 
-![View splitter button](/static/teachertool/view-splitter.png)
+![View splitter button](/static/code-eval-tool/view-splitter.png)
 
 Slide the splitter to widen the view of the criteria and results.
 
-![Split view resize](/static/teachertool/split-resize.png)
+![Split view resize](/static/code-eval-tool/split-resize.png)
diff --git a/docs/teachertool/carousels/checklists-for-games/cards.json b/docs/code-eval-tool/carousels/checklists-for-games/cards.json
similarity index 69%
rename from docs/teachertool/carousels/checklists-for-games/cards.json
rename to docs/code-eval-tool/carousels/checklists-for-games/cards.json
index 96134f4e3f6..653dcee575f 100644
--- a/docs/teachertool/carousels/checklists-for-games/cards.json
+++ b/docs/code-eval-tool/carousels/checklists-for-games/cards.json
@@ -4,37 +4,37 @@
             "cardType": "checklist-resource",
             "cardTitle": "Rock Paper Scissors",
             "imageUrl": "/static/mb/projects/a4-motion.png",
-            "checklistUrl": "/teachertool/checklists/rock-paper-scissors.json"
+            "checklistUrl": "/code-eval-tool/checklists/rock-paper-scissors.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Coin Flipper",
             "imageUrl": "/static/mb/projects/coin-flipper.png",
-            "checklistUrl": "/teachertool/checklists/coin-flipper.json"
+            "checklistUrl": "/code-eval-tool/checklists/coin-flipper.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "7 seconds",
             "imageUrl": "/static/mb/projects/7-seconds.png",
-            "checklistUrl": "/teachertool/checklists/7-seconds.json"
+            "checklistUrl": "/code-eval-tool/checklists/7-seconds.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Hot Potato",
             "imageUrl": "/static/mb/projects/hot-potato.png",
-            "checklistUrl": "/teachertool/checklists/hot-potato.json"
+            "checklistUrl": "/code-eval-tool/checklists/hot-potato.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Tug-Of-LED",
             "imageUrl": "/static/mb/projects/tug-of-led.png",
-            "checklistUrl": "/teachertool/checklists/tug-of-led.json"
+            "checklistUrl": "/code-eval-tool/checklists/tug-of-led.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Snap the dot",
             "imageUrl": "/static/mb/projects/snap-the-dot.png",
-            "checklistUrl": "/teachertool/checklists/snap-the-dot.json"
+            "checklistUrl": "/code-eval-tool/checklists/snap-the-dot.json"
         }
     ],
     "cards.hidden": [
@@ -42,25 +42,25 @@
             "cardType": "checklist-resource",
             "cardTitle": "Rock Paper Scissors V2",
             "imageUrl": "/static/mb/projects/a4-motion-v2.png",
-            "checklistUrl": "/teachertool/checklists/rock-paper-scissors-mbv2.json"
+            "checklistUrl": "/code-eval-tool/checklists/rock-paper-scissors-mbv2.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Heads Guess!",
             "imageUrl": "/static/mb/projects/heads-guess.png",
-            "checklistUrl": "/teachertool/checklists/heads-guess.json"
+            "checklistUrl": "/code-eval-tool/checklists/heads-guess.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Reaction Time",
             "imageUrl": "/static/mb/projects/reaction.jpg",
-            "checklistUrl": "/teachertool/checklists/reaction-time.json"
+            "checklistUrl": "/code-eval-tool/checklists/reaction-time.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Magic Button Trick",
             "imageUrl": "/static/mb/projects/magic-button-trick.png",
-            "checklistUrl": "/teachertool/checklists/magic-button-trick.json"
+            "checklistUrl": "/code-eval-tool/checklists/magic-button-trick.json"
         }
     ]
 }
diff --git a/docs/teachertool/carousels/checklists-for-tools/cards.json b/docs/code-eval-tool/carousels/checklists-for-tools/cards.json
similarity index 75%
rename from docs/teachertool/carousels/checklists-for-tools/cards.json
rename to docs/code-eval-tool/carousels/checklists-for-tools/cards.json
index 4f2c2d19a3c..59fb43b5775 100644
--- a/docs/teachertool/carousels/checklists-for-tools/cards.json
+++ b/docs/code-eval-tool/carousels/checklists-for-tools/cards.json
@@ -4,7 +4,7 @@
             "cardType": "checklist-resource",
             "cardTitle": "Level",
             "imageUrl": "/static/mb/projects/level.png",
-            "checklistUrl": "/teachertool/checklists/level.json"
+            "checklistUrl": "/code-eval-tool/checklists/level.json"
         }
     ],
     "cards.hidden": []
diff --git a/docs/teachertool/carousels/checklists-for-tutorials-v2/cards.json b/docs/code-eval-tool/carousels/checklists-for-tutorials-v2/cards.json
similarity index 69%
rename from docs/teachertool/carousels/checklists-for-tutorials-v2/cards.json
rename to docs/code-eval-tool/carousels/checklists-for-tutorials-v2/cards.json
index 4dab92f3527..6c01f085901 100644
--- a/docs/teachertool/carousels/checklists-for-tutorials-v2/cards.json
+++ b/docs/code-eval-tool/carousels/checklists-for-tutorials-v2/cards.json
@@ -4,37 +4,37 @@
             "cardType": "checklist-resource",
             "cardTitle": "Pet Hamster",
             "imageUrl": "/static/mb/projects/pet-hamster.png",
-            "checklistUrl": "/teachertool/checklists/pet-hamster-mbv2.json"
+            "checklistUrl": "/code-eval-tool/checklists/pet-hamster-mbv2.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Countdown",
             "imageUrl": "/static/mb/projects/countdown.png",
-            "checklistUrl": "/teachertool/checklists/countdown-mbv2.json"
+            "checklistUrl": "/code-eval-tool/checklists/countdown-mbv2.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Morse Chat",
             "imageUrl": "/static/mb/projects/morse-chat.png",
-            "checklistUrl": "/teachertool/checklists/morse-chat-mbv2.json"
+            "checklistUrl": "/code-eval-tool/checklists/morse-chat-mbv2.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Clap Lights",
             "imageUrl": "/static/mb/projects/clap-lights.png",
-            "checklistUrl": "/teachertool/checklists/clap-lights-mbv2.json"
+            "checklistUrl": "/code-eval-tool/checklists/clap-lights-mbv2.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Blow Away",
             "imageUrl": "/static/mb/projects/blow-away.png",
-            "checklistUrl": "/teachertool/checklists/blow-away-mbv2.json"
+            "checklistUrl": "/code-eval-tool/checklists/blow-away-mbv2.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Cat Napping",
             "imageUrl": "/static/mb/projects/cat-napping/1_lychee.png",
-            "checklistUrl": "/teachertool/checklists/cat-napping-mbv2.json"
+            "checklistUrl": "/code-eval-tool/checklists/cat-napping-mbv2.json"
         }
     ],
     "cards.hidden": []
diff --git a/docs/teachertool/carousels/checklists-for-tutorials/cards.json b/docs/code-eval-tool/carousels/checklists-for-tutorials/cards.json
similarity index 70%
rename from docs/teachertool/carousels/checklists-for-tutorials/cards.json
rename to docs/code-eval-tool/carousels/checklists-for-tutorials/cards.json
index e9a4d25a0be..3aed50c5654 100644
--- a/docs/teachertool/carousels/checklists-for-tutorials/cards.json
+++ b/docs/code-eval-tool/carousels/checklists-for-tutorials/cards.json
@@ -4,37 +4,37 @@
             "cardType": "checklist-resource",
             "cardTitle": "Flashing Heart",
             "imageUrl": "/static/mb/projects/a1-display.png",
-            "checklistUrl": "/teachertool/checklists/flashing-heart.json"
+            "checklistUrl": "/code-eval-tool/checklists/flashing-heart.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Name Tag",
             "imageUrl": "/static/mb/projects/name-tag.png",
-            "checklistUrl": "/teachertool/checklists/name-tag.json"
+            "checklistUrl": "/code-eval-tool/checklists/name-tag.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Smiley Buttons",
             "imageUrl": "/static/mb/projects/a2-buttons.png",
-            "checklistUrl": "/teachertool/checklists/smiley-buttons.json"
+            "checklistUrl": "/code-eval-tool/checklists/smiley-buttons.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Dice",
             "imageUrl": "/static/mb/projects/dice.png",
-            "checklistUrl": "/teachertool/checklists/dice.json"
+            "checklistUrl": "/code-eval-tool/checklists/dice.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Love Meter",
             "imageUrl": "/static/mb/projects/a3-pins.png",
-            "checklistUrl": "/teachertool/checklists/love-meter.json"
+            "checklistUrl": "/code-eval-tool/checklists/love-meter.json"
         },
         {
             "cardType": "checklist-resource",
             "cardTitle": "Micro Chat",
             "imageUrl": "/static/mb/projects/a9-radio.png",
-            "checklistUrl": "/teachertool/checklists/micro-chat.json"
+            "checklistUrl": "/code-eval-tool/checklists/micro-chat.json"
         }
     ],
     "cards.hidden": []
diff --git a/docs/teachertool/catalog.json b/docs/code-eval-tool/catalog.json
similarity index 88%
rename from docs/teachertool/catalog.json
rename to docs/code-eval-tool/catalog.json
index 0841326309c..2792882a690 100644
--- a/docs/teachertool/catalog.json
+++ b/docs/code-eval-tool/catalog.json
@@ -5,7 +5,7 @@
             "use": "responds_to_events",
             "template": "Responds to at least ${count} different event(s)",
             "description": "At least the specified number of event blocks are present.",
-            "docPath": "/teachertool",
+            "docPath": "/code-eval-tool",
             "maxCount": 1,
             "tags": ["Input and Output"],
             "params": [
@@ -22,7 +22,7 @@
             "use": "uses_input",
             "template": "Uses input",
             "description": "At least one block that reads or reacts to user input is present.",
-            "docPath": "/teachertool",
+            "docPath": "/code-eval-tool",
             "maxCount": 1,
             "tags": ["Input and Output"]
         },
@@ -31,7 +31,7 @@
             "use": "has_output",
             "template": "Produces output",
             "description": "At least one block that lights up LEDs, makes sound, or writes to pins is present.",
-            "docPath": "/teachertool",
+            "docPath": "/code-eval-tool",
             "maxCount": 1,
             "tags": ["Input and Output"]
         },
@@ -40,7 +40,7 @@
             "use": "uses_led_coordinates",
             "template": "Uses LED coordinates at least ${count} time(s)",
             "description": "Uses blocks with LED coordinate inputs at least the specified number of times.",
-            "docPath": "/teachertool",
+            "docPath": "/code-eval-tool",
             "maxCount": 1,
             "tags": ["Code Elements"],
             "params": [
@@ -57,7 +57,7 @@
             "use": "sends_radio_message",
             "template": "Sends radio messages",
             "description": "Radio group is set and at least one block that sends a radio message is present.",
-            "docPath": "/teachertool",
+            "docPath": "/code-eval-tool",
             "maxCount": 1,
             "tags": ["Input and Output"]
         },
@@ -66,7 +66,7 @@
             "use": "receives_radio_message",
             "template": "Receives radio messages",
             "description": "Radio group is set and at least one block that listens for radio messages is present.",
-            "docPath": "/teachertool",
+            "docPath": "/code-eval-tool",
             "maxCount": 1,
             "tags": ["Input and Output"]
         },
@@ -76,7 +76,7 @@
             "template": "Sets the radio group on startup",
             "description": "The 'radio set group' block is called in the 'on start' event.",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "7ECB3AD5-F1C1-4106-9259-802B2E69A7A2",
@@ -84,7 +84,7 @@
             "template": "Sends a radio string when a button is pressed",
             "description": "The 'radio send string' block is called inside a button press event",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "FAA97F77-C9F5-4D58-A3D5-47F965F4B6E2",
@@ -92,7 +92,7 @@
             "template": "Listens for incoming radio messages",
             "description": "Any 'on radio received' event (string, number, or name + value) is present.",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "D249AB3E-2620-4E33-911E-284303455365",
@@ -100,7 +100,7 @@
             "template": "Displays the received radio message on the screen",
             "description": "A 'show' block is called with the received message inside the 'on radio received' event.",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "7C2F70AB-2A00-4E35-8227-E5756957D7B3",
@@ -108,7 +108,7 @@
             "template": "Runs code when the micro:bit is shaken",
             "description": "When the user shakes the micro:bit, the code inside this block will run.",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "7CFD9718-E841-4286-9563-B70D2F22D8D8",
@@ -116,7 +116,7 @@
             "template": "Declares a variable called 'hand'",
             "description": "The project includes a variable called 'hand'",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "499EEFAB-2487-427E-8081-28EE031C7D17",
@@ -124,7 +124,7 @@
             "template": "Checks the value of the variable 'hand'",
             "description": "The project checks the value of the variable 'hand'",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "FD7E03B7-53F2-41B9-93ED-51AEA864468E",
@@ -132,21 +132,21 @@
             "template": "Show an icon on display when a condition is met",
             "description": "The project shows an icon on the display when a condition is met",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "850DBBDE-71BA-48D2-A1E4-7AC19716C976",
             "use": "get_sound_level",
             "template": "Sound level is detected in the program",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "F82F6BB4-2B1C-4CFF-92BA-65CE63DD6399",
             "use": "soundlevel_greater_than_check",
             "template": "Check that the sound level is greater than some number",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "B835FAA0-8CA6-4E4A-95B4-7FC6D15231BD",
@@ -154,21 +154,21 @@
             "template": "If a detected sound level is greater than some number, then two variables are set to random values",
             "description": "An if statement checks a detected sound level is greater than a predetermined number. If this is true, variables 'row' and 'col' are set to random values",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "CCA30B9D-4ED7-4916-94AF-050FC473FAA1",
             "use": "col_variable_set_random",
             "template": "Variable named 'col' is set to a random value",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "162222FB-8E2B-4131-9EA3-EC6B83DDAFB2",
             "use": "row_variable_set_random",
             "template": "Variable named 'row' is set to a random value",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "01A65046-D4BE-44B6-8273-7A878A71B3D0",
@@ -176,28 +176,28 @@
             "template": "Check that an LED is lit on the screen",
             "description": "At the spot ('col', 'row') on the LED screen, the LED is on",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "E3286B6D-5BEB-43EC-B246-C956AAC34C3E",
             "use": "unplot_vars_used",
             "template": "Turn off an LED at point ('col', 'row')",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "46AFEDA3-35CB-4041-BEC4-53C0D29E57BA",
             "use": "col_add_num",
             "template": "Sum the value of the 'col' variable and a given number",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "6BA59761-9464-4C8D-9D8F-E8985273FB92",
             "use": "plot_vars_used",
             "template": "Turn on an LED at point ('col' + 1, 'row')",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "5934E4C6-7AE4-46A4-8F92-99101987D064",
@@ -205,14 +205,14 @@
             "template": "Show an icon on the LED screen when the program starts",
             "description": "An icon block is used inside the on start block",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "0B2BC680-D79D-42C8-BA13-B6B189E2BF7D",
             "use": "point_condition",
             "template": "If an LED is on, turn it off and light up a different LED",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         },
         {
             "id": "ECC79C65-56DC-44A9-98FC-147F5EED87CC",
@@ -220,7 +220,7 @@
             "template": "Project completeness",
             "description": "The project contains all the blocks required at the end of the tutorial",
             "hideInCatalog": true,
-            "docPath": "/teachertool"
+            "docPath": "/code-eval-tool"
         }
     ]
 }
diff --git a/docs/teachertool/checklists/7-seconds.json b/docs/code-eval-tool/checklists/7-seconds.json
similarity index 100%
rename from docs/teachertool/checklists/7-seconds.json
rename to docs/code-eval-tool/checklists/7-seconds.json
diff --git a/docs/teachertool/checklists/blow-away-mbv2.json b/docs/code-eval-tool/checklists/blow-away-mbv2.json
similarity index 100%
rename from docs/teachertool/checklists/blow-away-mbv2.json
rename to docs/code-eval-tool/checklists/blow-away-mbv2.json
diff --git a/docs/teachertool/checklists/cat-napping-mbv2.json b/docs/code-eval-tool/checklists/cat-napping-mbv2.json
similarity index 100%
rename from docs/teachertool/checklists/cat-napping-mbv2.json
rename to docs/code-eval-tool/checklists/cat-napping-mbv2.json
diff --git a/docs/teachertool/checklists/clap-lights-mbv2.json b/docs/code-eval-tool/checklists/clap-lights-mbv2.json
similarity index 100%
rename from docs/teachertool/checklists/clap-lights-mbv2.json
rename to docs/code-eval-tool/checklists/clap-lights-mbv2.json
diff --git a/docs/teachertool/checklists/coin-flipper.json b/docs/code-eval-tool/checklists/coin-flipper.json
similarity index 100%
rename from docs/teachertool/checklists/coin-flipper.json
rename to docs/code-eval-tool/checklists/coin-flipper.json
diff --git a/docs/teachertool/checklists/countdown-mbv2.json b/docs/code-eval-tool/checklists/countdown-mbv2.json
similarity index 100%
rename from docs/teachertool/checklists/countdown-mbv2.json
rename to docs/code-eval-tool/checklists/countdown-mbv2.json
diff --git a/docs/teachertool/checklists/dice.json b/docs/code-eval-tool/checklists/dice.json
similarity index 100%
rename from docs/teachertool/checklists/dice.json
rename to docs/code-eval-tool/checklists/dice.json
diff --git a/docs/teachertool/checklists/flashing-heart.json b/docs/code-eval-tool/checklists/flashing-heart.json
similarity index 100%
rename from docs/teachertool/checklists/flashing-heart.json
rename to docs/code-eval-tool/checklists/flashing-heart.json
diff --git a/docs/teachertool/checklists/heads-guess.json b/docs/code-eval-tool/checklists/heads-guess.json
similarity index 100%
rename from docs/teachertool/checklists/heads-guess.json
rename to docs/code-eval-tool/checklists/heads-guess.json
diff --git a/docs/teachertool/checklists/hot-potato.json b/docs/code-eval-tool/checklists/hot-potato.json
similarity index 100%
rename from docs/teachertool/checklists/hot-potato.json
rename to docs/code-eval-tool/checklists/hot-potato.json
diff --git a/docs/teachertool/checklists/level.json b/docs/code-eval-tool/checklists/level.json
similarity index 100%
rename from docs/teachertool/checklists/level.json
rename to docs/code-eval-tool/checklists/level.json
diff --git a/docs/teachertool/checklists/love-meter.json b/docs/code-eval-tool/checklists/love-meter.json
similarity index 100%
rename from docs/teachertool/checklists/love-meter.json
rename to docs/code-eval-tool/checklists/love-meter.json
diff --git a/docs/teachertool/checklists/magic-button-trick.json b/docs/code-eval-tool/checklists/magic-button-trick.json
similarity index 100%
rename from docs/teachertool/checklists/magic-button-trick.json
rename to docs/code-eval-tool/checklists/magic-button-trick.json
diff --git a/docs/teachertool/checklists/micro-chat.json b/docs/code-eval-tool/checklists/micro-chat.json
similarity index 100%
rename from docs/teachertool/checklists/micro-chat.json
rename to docs/code-eval-tool/checklists/micro-chat.json
diff --git a/docs/teachertool/checklists/morse-chat-mbv2.json b/docs/code-eval-tool/checklists/morse-chat-mbv2.json
similarity index 100%
rename from docs/teachertool/checklists/morse-chat-mbv2.json
rename to docs/code-eval-tool/checklists/morse-chat-mbv2.json
diff --git a/docs/teachertool/checklists/name-tag.json b/docs/code-eval-tool/checklists/name-tag.json
similarity index 100%
rename from docs/teachertool/checklists/name-tag.json
rename to docs/code-eval-tool/checklists/name-tag.json
diff --git a/docs/teachertool/checklists/pet-hamster-mbv2.json b/docs/code-eval-tool/checklists/pet-hamster-mbv2.json
similarity index 100%
rename from docs/teachertool/checklists/pet-hamster-mbv2.json
rename to docs/code-eval-tool/checklists/pet-hamster-mbv2.json
diff --git a/docs/teachertool/checklists/reaction-time.json b/docs/code-eval-tool/checklists/reaction-time.json
similarity index 100%
rename from docs/teachertool/checklists/reaction-time.json
rename to docs/code-eval-tool/checklists/reaction-time.json
diff --git a/docs/teachertool/checklists/rock-paper-scissors-mbv2.json b/docs/code-eval-tool/checklists/rock-paper-scissors-mbv2.json
similarity index 100%
rename from docs/teachertool/checklists/rock-paper-scissors-mbv2.json
rename to docs/code-eval-tool/checklists/rock-paper-scissors-mbv2.json
diff --git a/docs/teachertool/checklists/rock-paper-scissors.json b/docs/code-eval-tool/checklists/rock-paper-scissors.json
similarity index 100%
rename from docs/teachertool/checklists/rock-paper-scissors.json
rename to docs/code-eval-tool/checklists/rock-paper-scissors.json
diff --git a/docs/teachertool/checklists/smiley-buttons.json b/docs/code-eval-tool/checklists/smiley-buttons.json
similarity index 100%
rename from docs/teachertool/checklists/smiley-buttons.json
rename to docs/code-eval-tool/checklists/smiley-buttons.json
diff --git a/docs/teachertool/checklists/snap-the-dot.json b/docs/code-eval-tool/checklists/snap-the-dot.json
similarity index 100%
rename from docs/teachertool/checklists/snap-the-dot.json
rename to docs/code-eval-tool/checklists/snap-the-dot.json
diff --git a/docs/teachertool/checklists/tug-of-led.json b/docs/code-eval-tool/checklists/tug-of-led.json
similarity index 100%
rename from docs/teachertool/checklists/tug-of-led.json
rename to docs/code-eval-tool/checklists/tug-of-led.json
diff --git a/docs/teachertool/test/catalog.json b/docs/code-eval-tool/test/catalog.json
similarity index 100%
rename from docs/teachertool/test/catalog.json
rename to docs/code-eval-tool/test/catalog.json
diff --git a/docs/teachertool/test/validator-plans.json b/docs/code-eval-tool/test/validator-plans.json
similarity index 100%
rename from docs/teachertool/test/validator-plans.json
rename to docs/code-eval-tool/test/validator-plans.json
diff --git a/docs/teachertool/validator-plans.json b/docs/code-eval-tool/validator-plans.json
similarity index 100%
rename from docs/teachertool/validator-plans.json
rename to docs/code-eval-tool/validator-plans.json
diff --git a/docs/static/teachertool/add-criteria.png b/docs/static/code-eval-tool/add-criteria.png
similarity index 100%
rename from docs/static/teachertool/add-criteria.png
rename to docs/static/code-eval-tool/add-criteria.png
diff --git a/docs/static/teachertool/autorun-button.png b/docs/static/code-eval-tool/autorun-button.png
similarity index 100%
rename from docs/static/teachertool/autorun-button.png
rename to docs/static/code-eval-tool/autorun-button.png
diff --git a/docs/static/teachertool/checklist-download.png b/docs/static/code-eval-tool/checklist-download.png
similarity index 100%
rename from docs/static/teachertool/checklist-download.png
rename to docs/static/code-eval-tool/checklist-download.png
diff --git a/docs/static/teachertool/checklist-execution.png b/docs/static/code-eval-tool/checklist-execution.png
similarity index 100%
rename from docs/static/teachertool/checklist-execution.png
rename to docs/static/code-eval-tool/checklist-execution.png
diff --git a/docs/static/teachertool/checklist-name.png b/docs/static/code-eval-tool/checklist-name.png
similarity index 100%
rename from docs/static/teachertool/checklist-name.png
rename to docs/static/code-eval-tool/checklist-name.png
diff --git a/docs/static/teachertool/criteria-items.png b/docs/static/code-eval-tool/criteria-items.png
similarity index 100%
rename from docs/static/teachertool/criteria-items.png
rename to docs/static/code-eval-tool/criteria-items.png
diff --git a/docs/static/teachertool/edit-outcome-1.png b/docs/static/code-eval-tool/edit-outcome-1.png
similarity index 100%
rename from docs/static/teachertool/edit-outcome-1.png
rename to docs/static/code-eval-tool/edit-outcome-1.png
diff --git a/docs/static/teachertool/edit-outcome-2.png b/docs/static/code-eval-tool/edit-outcome-2.png
similarity index 100%
rename from docs/static/teachertool/edit-outcome-2.png
rename to docs/static/code-eval-tool/edit-outcome-2.png
diff --git a/docs/static/teachertool/editing-results-1.png b/docs/static/code-eval-tool/editing-results-1.png
similarity index 100%
rename from docs/static/teachertool/editing-results-1.png
rename to docs/static/code-eval-tool/editing-results-1.png
diff --git a/docs/static/teachertool/editing-results-2.png b/docs/static/code-eval-tool/editing-results-2.png
similarity index 100%
rename from docs/static/teachertool/editing-results-2.png
rename to docs/static/code-eval-tool/editing-results-2.png
diff --git a/docs/static/teachertool/editing-results-3.png b/docs/static/code-eval-tool/editing-results-3.png
similarity index 100%
rename from docs/static/teachertool/editing-results-3.png
rename to docs/static/code-eval-tool/editing-results-3.png
diff --git a/docs/static/teachertool/export-checklist.png b/docs/static/code-eval-tool/export-checklist.png
similarity index 100%
rename from docs/static/teachertool/export-checklist.png
rename to docs/static/code-eval-tool/export-checklist.png
diff --git a/docs/static/teachertool/import-checklist-card.png b/docs/static/code-eval-tool/import-checklist-card.png
similarity index 100%
rename from docs/static/teachertool/import-checklist-card.png
rename to docs/static/code-eval-tool/import-checklist-card.png
diff --git a/docs/static/teachertool/import-checklist-dragdrop-1.png b/docs/static/code-eval-tool/import-checklist-dragdrop-1.png
similarity index 100%
rename from docs/static/teachertool/import-checklist-dragdrop-1.png
rename to docs/static/code-eval-tool/import-checklist-dragdrop-1.png
diff --git a/docs/static/teachertool/import-checklist-dragdrop-2.png b/docs/static/code-eval-tool/import-checklist-dragdrop-2.png
similarity index 100%
rename from docs/static/teachertool/import-checklist-dragdrop-2.png
rename to docs/static/code-eval-tool/import-checklist-dragdrop-2.png
diff --git a/docs/static/teachertool/import-checklist-menu.png b/docs/static/code-eval-tool/import-checklist-menu.png
similarity index 100%
rename from docs/static/teachertool/import-checklist-menu.png
rename to docs/static/code-eval-tool/import-checklist-menu.png
diff --git a/docs/static/teachertool/loaded-project.png b/docs/static/code-eval-tool/loaded-project.png
similarity index 100%
rename from docs/static/teachertool/loaded-project.png
rename to docs/static/code-eval-tool/loaded-project.png
diff --git a/docs/static/teachertool/new-rubric-from-menu.png b/docs/static/code-eval-tool/new-rubric-from-menu.png
similarity index 100%
rename from docs/static/teachertool/new-rubric-from-menu.png
rename to docs/static/code-eval-tool/new-rubric-from-menu.png
diff --git a/docs/static/teachertool/new-rubric.png b/docs/static/code-eval-tool/new-rubric.png
similarity index 100%
rename from docs/static/teachertool/new-rubric.png
rename to docs/static/code-eval-tool/new-rubric.png
diff --git a/docs/static/teachertool/parameters-1.png b/docs/static/code-eval-tool/parameters-1.png
similarity index 100%
rename from docs/static/teachertool/parameters-1.png
rename to docs/static/code-eval-tool/parameters-1.png
diff --git a/docs/static/teachertool/parameters-2.png b/docs/static/code-eval-tool/parameters-2.png
similarity index 100%
rename from docs/static/teachertool/parameters-2.png
rename to docs/static/code-eval-tool/parameters-2.png
diff --git a/docs/static/teachertool/parameters-3.png b/docs/static/code-eval-tool/parameters-3.png
similarity index 100%
rename from docs/static/teachertool/parameters-3.png
rename to docs/static/code-eval-tool/parameters-3.png
diff --git a/docs/static/teachertool/prebuilt-rubrics.png b/docs/static/code-eval-tool/prebuilt-rubrics.png
similarity index 100%
rename from docs/static/teachertool/prebuilt-rubrics.png
rename to docs/static/code-eval-tool/prebuilt-rubrics.png
diff --git a/docs/static/teachertool/print-button.png b/docs/static/code-eval-tool/print-button.png
similarity index 100%
rename from docs/static/teachertool/print-button.png
rename to docs/static/code-eval-tool/print-button.png
diff --git a/docs/static/teachertool/remove-criteria.png b/docs/static/code-eval-tool/remove-criteria.png
similarity index 100%
rename from docs/static/teachertool/remove-criteria.png
rename to docs/static/code-eval-tool/remove-criteria.png
diff --git a/docs/static/teachertool/run-checklist-button.png b/docs/static/code-eval-tool/run-checklist-button.png
similarity index 100%
rename from docs/static/teachertool/run-checklist-button.png
rename to docs/static/code-eval-tool/run-checklist-button.png
diff --git a/docs/static/teachertool/split-resize.png b/docs/static/code-eval-tool/split-resize.png
similarity index 100%
rename from docs/static/teachertool/split-resize.png
rename to docs/static/code-eval-tool/split-resize.png
diff --git a/docs/static/teachertool/validate-me.png b/docs/static/code-eval-tool/validate-me.png
similarity index 100%
rename from docs/static/teachertool/validate-me.png
rename to docs/static/code-eval-tool/validate-me.png
diff --git a/docs/static/teachertool/view-splitter.png b/docs/static/code-eval-tool/view-splitter.png
similarity index 100%
rename from docs/static/teachertool/view-splitter.png
rename to docs/static/code-eval-tool/view-splitter.png