diff --git a/l1-contracts/deploy-scripts/DeployL1.s.sol b/l1-contracts/deploy-scripts/DeployL1.s.sol
index 7fa5a3ff9..2c5554684 100644
--- a/l1-contracts/deploy-scripts/DeployL1.s.sol
+++ b/l1-contracts/deploy-scripts/DeployL1.s.sol
@@ -12,7 +12,7 @@ import {Utils} from "./Utils.sol";
 import {Multicall3} from "contracts/dev-contracts/Multicall3.sol";
 import {DualVerifier} from "contracts/state-transition/verifiers/DualVerifier.sol";
 import {VerifierPlonk} from "contracts/state-transition/verifiers/VerifierPlonk.sol";
-import {VerifierFFLONK} from "contracts/state-transition/verifiers/VerifierFFLONK.sol";
+import {VerifierFflonk} from "contracts/state-transition/verifiers/VerifierFFLONK.sol";
 import {TestnetVerifier} from "contracts/state-transition/verifiers/TestnetVerifier.sol";
 import {VerifierParams, IVerifier} from "contracts/state-transition/chain-interfaces/IVerifier.sol";
 import {DefaultUpgrade} from "contracts/upgrades/DefaultUpgrade.sol";
diff --git a/tools/data/fflonk_scheduler_key.json b/tools/data/fflonk_scheduler_key.json
new file mode 100644
index 000000000..cdd43ec5f
--- /dev/null
+++ b/tools/data/fflonk_scheduler_key.json
@@ -0,0 +1,399 @@
+{
+  "n": 16777215,
+  "num_inputs": 1,
+  "state_width": 4,
+  "num_witness_polys": 0,
+  "gate_setup_commitments": [
+    {
+      "x": [
+        7041473518753276610,
+        14535424708528669582,
+        13201344011965459113,
+        2897130087748692189
+      ],
+      "y": [
+        7551377240045957203,
+        3938680994559003687,
+        16706483137576353901,
+        2786003470784327326
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        18272574112566878458,
+        16137981417959663614,
+        15838588009131800405,
+        3015283904275055936
+      ],
+      "y": [
+        5587221603595800838,
+        4961680924870800295,
+        17117659941986630706,
+        2617194840215249322
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        13975462584861812129,
+        18178670042078411614,
+        3386195693215471468,
+        2666700336260012533
+      ],
+      "y": [
+        3977105627642414202,
+        4537400861054151716,
+        15475898821594098620,
+        1658247751320851774
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        16277842833814772923,
+        4655257551374867597,
+        14613527128427906214,
+        2384011263837220434
+      ],
+      "y": [
+        13438155507917260925,
+        1681961783360029593,
+        9838145283630619191,
+        3145022577013212364
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        2257074215792094795,
+        15840297332048800261,
+        7752787513729517208,
+        2213812271775260313
+      ],
+      "y": [
+        9504815042706281750,
+        3143783907329110636,
+        5726996484641831885,
+        2348348756186715020
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        9436269926173034716,
+        8353505617703691640,
+        9263372864563147133,
+        452364547608181011
+      ],
+      "y": [
+        53517401948131448,
+        8600683373039886778,
+        10713988639514953496,
+        3091884229552279711
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        2471001934854133497,
+        11932587151841940290,
+        9727983790633853429,
+        743292418711407275
+      ],
+      "y": [
+        2219922039574131913,
+        6200487752881169488,
+        159222541455338254,
+        1981289514965404461
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        10387557038099338908,
+        3777779600416753782,
+        8279688681580161825,
+        2096714248633885271
+      ],
+      "y": [
+        4003894836596889278,
+        7566819875065610759,
+        6937892309101934040,
+        724425532685653216
+      ],
+      "infinity": false
+    }
+  ],
+  "gate_selectors_commitments": [
+    {
+      "x": [
+        14203539687749767931,
+        12414461990983607643,
+        5173799202403416188,
+        2531047567583200315
+      ],
+      "y": [
+        17890925178676127921,
+        8067135813786054903,
+        10294951679721596259,
+        3372244430865439083
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        8250938356182918828,
+        8989523127942126907,
+        12291296797984538953,
+        265866581838824098
+      ],
+      "y": [
+        2552096304808713451,
+        4528060267622140868,
+        14222476710621591571,
+        2515703838465707069
+      ],
+      "infinity": false
+    }
+  ],
+  "permutation_commitments": [
+    {
+      "x": [
+        4760310670502670392,
+        9133307033789266781,
+        1165299145606630987,
+        2333423271383629947
+      ],
+      "y": [
+        8701338046602933584,
+        8244575834977400721,
+        13923835279411448645,
+        590842459332837393
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        16765704004844786377,
+        3734854353194303779,
+        5208541298592688636,
+        2007126263945456660
+      ],
+      "y": [
+        9390331670076615527,
+        10546395594767890107,
+        16710005739026562911,
+        1094385967155653873
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        96544706602781130,
+        14501961830701305797,
+        15551447137139813444,
+        2721397587554959520
+      ],
+      "y": [
+        18248300896616317016,
+        6044137253057084277,
+        1109466816695564632,
+        1681424544305600892
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        636393164683958416,
+        2470980311335149449,
+        9058696428947095766,
+        2865953210317054750
+      ],
+      "y": [
+        14660427536101265956,
+        9635151643854767246,
+        13687651037244306121,
+        1736513100272294968
+      ],
+      "infinity": false
+    }
+  ],
+  "total_lookup_entries_length": 115748,
+  "lookup_selector_commitment": {
+    "x": [
+      14450683051820374086,
+      14392669012541711696,
+      1085264196371072001,
+      1432911718574403450
+    ],
+    "y": [
+      2375311355237024951,
+      6153452264574448462,
+      14765716199346364060,
+      2813994675009564617
+    ],
+    "infinity": false
+  },
+  "lookup_tables_commitments": [
+    {
+      "x": [
+        10873859091125335643,
+        3906092213625635374,
+        17046157606087980048,
+        3193402705223440293
+      ],
+      "y": [
+        10158946293873382504,
+        2171386304067884865,
+        6918663094168980658,
+        350601565475975409
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        12822112641313049260,
+        3646552465186399021,
+        10324071010773924047,
+        2209084192380614662
+      ],
+      "y": [
+        11045141628975531869,
+        12589678537679955590,
+        3065046617868727674,
+        2099447669854151830
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        11395032673621937545,
+        3000063650268118516,
+        7857619430005721792,
+        805706808484810738
+      ],
+      "y": [
+        6817063666434679427,
+        1646386051225388537,
+        4677946977082722827,
+        1369650305976868514
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        2885179371868476351,
+        159944842081142878,
+        6092294387055034894,
+        213843603626505240
+      ],
+      "y": [
+        11868113133779277990,
+        8509646480531194854,
+        14088068011597639414,
+        707070630614027545
+      ],
+      "infinity": false
+    }
+  ],
+  "lookup_table_type_commitment": {
+    "x": [
+      10866682157158839994,
+      1596061817389919048,
+      4796403318062291708,
+      3038810910820814384
+    ],
+    "y": [
+      2859202713989048607,
+      17537733215249445364,
+      1109622377575874158,
+      2641119576344589003
+    ],
+    "infinity": false
+  },
+  "non_residues": [
+    [
+      5,
+      0,
+      0,
+      0
+    ],
+    [
+      7,
+      0,
+      0,
+      0
+    ],
+    [
+      10,
+      0,
+      0,
+      0
+    ]
+  ],
+  "g2_elements": [
+    {
+      "x": {
+        "c0": [
+          5106727233969649389,
+          7440829307424791261,
+          4785637993704342649,
+          1729627375292849782
+        ],
+        "c1": [
+          10945020018377822914,
+          17413811393473931026,
+          8241798111626485029,
+          1841571559660931130
+        ]
+      },
+      "y": {
+        "c0": [
+          5541340697920699818,
+          16416156555105522555,
+          5380518976772849807,
+          1353435754470862315
+        ],
+        "c1": [
+          6173549831154472795,
+          13567992399387660019,
+          17050234209342075797,
+          650358724130500725
+        ]
+      },
+      "infinity": false
+    },
+    {
+      "x": {
+        "c0": [
+          9089143573911733168,
+          11482283522806384523,
+          13585589533905622862,
+          79029415676722370
+        ],
+        "c1": [
+          5692040832573735873,
+          16884514497384809355,
+          16717166481813659368,
+          2742131088506155463
+        ]
+      },
+      "y": {
+        "c0": [
+          9604638503594647125,
+          1289961608472612514,
+          6217038149984805214,
+          2521661352385209130
+        ],
+        "c1": [
+          17168069778630926308,
+          11309277837895768996,
+          15154989611154567813,
+          359271377050603491
+        ]
+      },
+      "infinity": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tools/data/plonk_scheduler_key.json b/tools/data/plonk_scheduler_key.json
index acb7e3fe8..5d1e4668b 100644
--- a/tools/data/plonk_scheduler_key.json
+++ b/tools/data/plonk_scheduler_key.json
@@ -6,31 +6,31 @@
   "gate_setup_commitments": [
     {
       "x": [
-        14543631136906534221,
-        11532161447842416044,
-        11114175029926010938,
-        1228896787564295039
+        9369242392284320144,
+        6675816858104016523,
+        14858001051416907000,
+        1225669426425319311
       ],
       "y": [
-        13293602262342424489,
-        8897930584356943159,
-        13256028170406220369,
-        3214939367598363288
+        897720706316680261,
+        18195860010054430178,
+        16160026306869138511,
+        1356550183856877875
       ],
       "infinity": false
     },
     {
       "x": [
-        11488992528554025682,
-        12016824828223971094,
-        11942004360057333370,
-        316831626296641307
+        13351117607150022275,
+        2933944144818388240,
+        5793025266725453005,
+        2556701126328621680
       ],
       "y": [
-        304673622018339856,
-        7139037552557818730,
-        12475560967982555143,
-        1055588351918295250
+        11734966568724119012,
+        10190935222331090906,
+        3787185007465109138,
+        2738968085076409877
       ],
       "infinity": false
     },
@@ -51,16 +51,16 @@
     },
     {
       "x": [
-        14005362797509427677,
-        2662603874351919260,
-        14261489165672308143,
-        1470528288349794782
+        9218031701224450589,
+        1534624245124893249,
+        9487357625416639257,
+        647718627141905922
       ],
       "y": [
-        11144229651170108862,
-        11439490264313454962,
-        114993091474760680,
-        1037267173208738614
+        17236328806143473432,
+        8632015779980017059,
+        11243854438144489053,
+        550609446344292359
       ],
       "infinity": false
     },
@@ -160,31 +160,31 @@
   "permutation_commitments": [
     {
       "x": [
-        14761045450946573029,
-        17157644513453531531,
-        2555518804134782053,
-        1415819224310783987
+        3381581189461180576,
+        10195903826114386111,
+        8297057778034101109,
+        2324302591285452919
       ],
       "y": [
-        17265629196749977462,
-        4128711855633066822,
-        8435602817910411328,
-        1408116296902303196
+        10421881628401567792,
+        2477974325209761168,
+        14091332093800636238,
+        38389216099900129
       ],
       "infinity": false
     },
     {
       "x": [
-        3307267823832528482,
-        2406249680085831639,
-        9091964031261402109,
-        2846274000290842933
+        16312762970049520418,
+        17708498487240008455,
+        2090500726309035458,
+        798851154880350532
       ],
       "y": [
-        17374905554931807856,
-        6690578002079222163,
-        11809376320193686210,
-        2676076649992974574
+        18255293396520572182,
+        13666524753490475927,
+        6924585208062867717,
+        2325827847806608329
       ],
       "infinity": false
     },
@@ -205,16 +205,16 @@
     },
     {
       "x": [
-        18349397811516917436,
-        4473982696343317918,
-        13070312540813307819,
-        2109468484629113245
+        10372574323545302620,
+        13217158678971910881,
+        14902220059266038709,
+        2349385863635190438
       ],
       "y": [
-        13254534552549721008,
-        17388411854346636521,
-        17875890960520499518,
-        1062184221180884481
+        16050259647084466717,
+        15943269640590918056,
+        9762020112148613496,
+        1321808533889686645
       ],
       "infinity": false
     }