diff --git a/challenges/01-front-end-development-certification/basic-javascript.json b/challenges/01-front-end-development-certification/basic-javascript.json
index 3e5bcf7a68..e0f927db84 100644
--- a/challenges/01-front-end-development-certification/basic-javascript.json
+++ b/challenges/01-front-end-development-certification/basic-javascript.json
@@ -805,8 +805,8 @@
         "assert(convert(20) === 68, 'message: <code>convert(20)</code> should return a value of <code>68</code>');",
         "assert(convert(30) === 86, 'message: <code>convert(30)</code> should return a value of <code>86</code>');"
       ],
-      "type": "bonfire",
-      "challengeType": "5",
+      "type": "waypoint",
+      "challengeType": "1",
       "nameCn": "",
       "nameFr": "",
       "nameRu": "",
@@ -1352,8 +1352,8 @@
         "assert(/dog/.test(test1) && /big/.test(test1) && /ran/.test(test1) && /quickly/.test(test1),'message: <code>wordBlanks(\"dog\", \"big\", \"ran\", \"quickly\")</code> should contain all of the passed words.');",
         "assert(/cat/.test(test2) && /little/.test(test2) && /hit/.test(test2) && /slowly/.test(test2),'message: <code>wordBlanks(\"cat\", \"little\", \"hit\", \"slowly\")</code> should contain all of the passed words.');"
       ],
-      "type": "bonfire",
-      "challengeType": "5",
+      "type": "waypoint",
+      "challengeType": "1",
       "nameCn": "",
       "nameFr": "",
       "nameRu": "",
@@ -1717,8 +1717,8 @@
         "assert(hasNumber, 'message: The second elements in each of your sub-arrays must all be numbers');",
         "assert(count > 4, 'message: You must have at least 5 items in your list');"
       ],
-      "type": "bonfire",
-      "challengeType": "5",
+      "type": "waypoint",
+      "challengeType": "1",
       "nameCn": "",
       "nameFr": "",
       "nameRu": "",
@@ -2145,8 +2145,8 @@
         "assert(queue([2],1) === 2, 'message: <code>queue([2], 1)</code> should return <code>2</code>');",
         "queue(myArr, 10); assert(myArr[4] === 10, 'message: After <code>queue(myArr, 10)</code>, <code>myArr[4]</code> should be <code>10</code>');"
       ],
-      "type": "bonfire",
-      "challengeType": "5",
+      "type": "waypoint",
+      "challengeType": "1",
       "nameCn": "",
       "nameFr": "",
       "nameRu": "",
@@ -2859,8 +2859,8 @@
         "assert(golfScore(4, 7) === \"Go Home!\", 'message: <code>golfScore(4, 7)</code> should return \"Go Home!\"');",
         "assert(golfScore(5, 9) === \"Go Home!\", 'message: <code>golfScore(5, 9)</code> should return \"Go Home!\"');"
       ],
-      "type": "bonfire",
-      "challengeType": "5",
+      "type": "waypoint",
+      "challengeType": "1",
       "nameCn": "",
       "nameFr": "",
       "nameRu": "",
@@ -3201,8 +3201,8 @@
         "assert((function(){ count = 0; cc(10);cc('J');cc('Q');cc('K');var out = cc('A'); if(out === \"-5 Hold\") {return true;} return false; })(), 'message: Cards Sequence 10, J, Q, K, A should return <code>\"-5 Hold\"</code>');",
         "assert((function(){ count = 0; cc(3);cc(2);cc('A');cc(10);var out = cc('K'); if(out === \"-1 Hold\") {return true;} return false; })(), 'message: Cards Sequence 3, 2, A, 10, K should return <code>\"-1 Hold\"</code>');"
       ],
-      "type": "bonfire",
-      "challengeType": "5",
+      "type": "waypoint",
+      "challengeType": "1",
       "nameCn": "",
       "nameFr": "",
       "nameRu": "",
@@ -3875,8 +3875,8 @@
         "assert(update(1245, \"tracks\", \"Addicted to Love\")[1245][\"tracks\"].length === 1, 'message: After <code>update(1245, \"tracks\", \"Addicted to Love\")</code>, <code>tracks</code> should have a length of <code>1</code>');",
         "update(2548, \"tracks\", \"\"); assert(!collection[2548].hasOwnProperty(\"tracks\"), 'message: After <code>update(2548, \"tracks\", \"\")</code>, <code>tracks</code> should not be set');"
       ],
-      "type": "bonfire",
-      "challengeType": "5",
+      "type": "waypoint",
+      "challengeType": "1",
       "nameCn": "",
       "nameFr": "",
       "nameRu": "",
@@ -4166,8 +4166,8 @@
         "assert(rot13(\"SERR YBIR?\") === \"FREE LOVE?\", 'message: <code>rot13(\"SERR YBIR?\")</code> should decode to <code>\"FREE LOVE?\"</code>');",
         "assert(rot13(\"GUR DHVPX OEBJA QBT WHZCRQ BIRE GUR YNML SBK.\") === \"THE QUICK BROWN DOG JUMPED OVER THE LAZY FOX.\", 'message: <code>rot13(\"GUR DHVPX OEBJA QBT WHZCRQ BIRE GUR YNML SBK.\")</code> should decode to <code>\"THE QUICK BROWN DOG JUMPED OVER THE LAZY FOX.\"</code>');"
       ],
-      "type": "bonfire",
-      "challengeType": "5",
+      "type": "waypoint",
+      "challengeType": "1",
       "nameCn": "",
       "nameFr": "",
       "nameRu": "",