diff --git a/include/nfl/params.hpp b/include/nfl/params.hpp
index 48fe8a6..2522aa6 100644
--- a/include/nfl/params.hpp
+++ b/include/nfl/params.hpp
@@ -28,7 +28,7 @@ struct params<uint16_t> {
   static constexpr unsigned int kModulusBitsize = 14;
   static constexpr unsigned int kModulusRepresentationBitsize = 16;
 
-  // A primitive 2*kMaxNbModuli (i.e., 2**10) root of unity for each one of the moduli
+  // A primitive 2*kMaxPolyDegree (i.e., 2**10) root of unity for each one of the moduli
   static constexpr value_type primitive_roots[kMaxNbModuli] = { 4989U, 10076U};
 
   // Inverses of kMaxPolyDegree (for the other degrees it can be derived easily)
@@ -65,7 +65,7 @@ struct params<uint32_t> {
   static constexpr unsigned int kModulusBitsize = 30;
   static constexpr unsigned int kModulusRepresentationBitsize = 32;
 
-  // A primitive 2*kMaxNbModuli (i.e., 2**16) root of unity for each one of the moduli
+  // A primitive 2*kMaxPolyDegree (i.e., 2**16) root of unity for each one of the moduli
   static constexpr value_type primitive_roots[kMaxNbModuli] = { 31849551UL, 356382027UL, 467961354UL, 257997683UL, 193971320UL, 986867018UL, 78897767UL, 141225606UL, 731415844UL, 481144344UL, 917696061UL, 824741354UL, 451941790UL, 511843912UL, 135407195UL, 268428099UL, 1043510723UL, 1027110081UL, 195647351UL, 716805350UL, 113557401UL, 987845126UL, 465868585UL, 930935832UL, 711950136UL, 600277758UL, 736842454UL, 683080388UL, 459510224UL, 1051308252UL, 789600351UL, 935970884UL, 1013911055UL, 564224276UL, 45722012UL, 811581154UL, 281582338UL, 736594740UL, 509029995UL, 538290980UL, 970852006UL, 637408511UL, 909804798UL, 496492720UL, 26918549UL, 955604559UL, 611725686UL, 291936538UL, 389257815UL, 237393427UL, 822698849UL, 484758567UL, 725180172UL, 612238799UL, 273298163UL, 288882155UL, 248109450UL, 561794780UL, 412389194UL, 50998274UL, 744457459UL, 292205063UL, 404202187UL, 130586100UL, 572693692UL, 296054776UL, 980379721UL, 240458115UL, 33422515UL, 753620756UL, 595727672UL, 749845421UL, 515881690UL, 906263522UL, 58596697UL, 582232621UL, 623063662UL, 377670161UL, 417994872UL, 363098156UL, 409390188UL, 382395118UL, 802423663UL, 599312286UL, 485258993UL, 123542277UL, 950144517UL, 822711287UL, 61354328UL, 130725897UL, 50393163UL, 935574104UL, 668222478UL, 83644338UL, 146114408UL, 421485125UL, 51711619UL, 597301808UL, 529986259UL, 492274105UL, 629671588UL, 678509228UL, 256722117UL, 716060156UL, 303501520UL, 947258284UL, 324690155UL, 696499346UL, 838122960UL, 289705620UL, 673140871UL, 736895916UL, 275896460UL, 64254247UL, 62185961UL, 985535037UL, 555391276UL, 349922125UL, 382888865UL, 955727212UL, 720292378UL, 57152593UL, 790880360UL, 772379300UL, 140261556UL, 766563632UL, 333021694UL, 263951156UL, 482050352UL, 76882539UL, 889521330UL, 223642152UL, 306060368UL, 485542901UL, 315992970UL, 32684578UL, 863182060UL, 200815263UL, 737807518UL, 817342606UL, 657389593UL, 616477502UL, 947051752UL, 667104651UL, 206420650UL, 681430749UL, 147878222UL, 42184139UL, 460204383UL, 102333812UL, 434691353UL, 893707921UL, 551058918UL, 568322430UL, 549779534UL, 235021553UL, 468703120UL, 506133797UL, 289912723UL, 360492011UL, 266554416UL, 544987643UL, 130513888UL, 588868428UL, 257446540UL, 267350033UL, 82940242UL, 888223888UL, 143616268UL, 524108179UL, 546700839UL, 285958595UL, 90709153UL, 759541963UL, 914547620UL, 452044030UL, 726905514UL, 764019890UL, 524189590UL, 274796890UL, 2388500UL, 373751831UL, 830340131UL, 692434233UL, 640939471UL, 363731365UL, 229329593UL, 119932545UL, 928409591UL, 348209485UL, 910186139UL, 438669643UL, 16032812UL, 588919169UL, 726952419UL, 735369453UL, 279036188UL, 788979514UL, 176321352UL, 27773270UL, 864636230UL, 614213393UL, 681871177UL, 233724697UL, 534389769UL, 271129484UL, 103843851UL, 456813507UL, 679435667UL, 609772346UL, 58054184UL, 635762979UL, 364525743UL, 517123079UL, 593689351UL, 647589910UL, 180901548UL, 125805246UL, 783016646UL, 85057029UL, 805997399UL, 649559343UL, 635321450UL, 472329012UL, 334277855UL, 545637012UL, 246464126UL, 84790531UL, 586558770UL, 261980830UL, 714315319UL, 303146283UL, 146808625UL, 832766494UL, 823970685UL, 879401241UL, 352864877UL, 484613343UL, 364729393UL, 806935761UL, 782859138UL, 421938482UL, 488097109UL, 172788362UL, 249165274UL, 26921129UL, 638071656UL, 505012294UL, 889007407UL, 563970147UL, 98911320UL, 342881086UL, 145937642UL, 355719080UL, 112206860UL, 288794207UL, 85452402UL, 376073954UL, 774199808UL, 843044492UL, 454572415UL, 729432259UL, 789368793UL, 705829775UL, 43171563UL, 422829216UL, 523524573UL, 689989113UL, 458602141UL, 143121466UL, 366097039UL, 277392906UL, 196514158UL, 455703634UL, 801714871UL, 390468618UL, 155793404UL, 188395428UL, 376333671UL, 622545404UL, 219288049UL, 600175757UL, 524092569UL, 321406558UL, 672786289UL, 441231750UL, 103690650UL, 23085763UL, 128280706UL, 327635561UL, 558592916UL};