diff --git a/compiler/aliases.nim b/compiler/aliases.nim
index 0006c9fe636b9..8b8353060502a 100644
--- a/compiler/aliases.nim
+++ b/compiler/aliases.nim
@@ -10,7 +10,7 @@
 ## Simple alias analysis for the HLO and the code generators.
 
 import
-  ast, astalgo, types, trees, intsets
+  ast, astalgo, types, trees, ordsets
 
 type
   TAnalysisResult* = enum
@@ -59,7 +59,7 @@ proc isPartOfAux(a, b: PType, marker: var IntSet): TAnalysisResult =
 
 proc isPartOf(a, b: PType): TAnalysisResult =
   ## checks iff 'a' can be part of 'b'. Iterates over VALUE types!
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   # watch out: parameters reversed because I'm too lazy to change the code...
   result = isPartOfAux(b, a, marker)
 
diff --git a/compiler/astalgo.nim b/compiler/astalgo.nim
index 6aecb1dcb4892..1eb3df97f762a 100644
--- a/compiler/astalgo.nim
+++ b/compiler/astalgo.nim
@@ -12,7 +12,7 @@
 # the data structures here are used in various places of the compiler.
 
 import
-  ast, hashes, intsets, strutils, options, lineinfos, ropes, idents, rodutils,
+  ast, hashes, ordsets, strutils, options, lineinfos, ropes, idents, rodutils,
   msgs
 
 proc hashNode*(p: RootRef): Hash
@@ -389,15 +389,15 @@ proc treeToYamlAux(conf: ConfigRef; n: PNode, marker: var IntSet, indent: int,
     result.addf("$N$1}", [rspaces(indent)])
 
 proc treeToYaml(conf: ConfigRef; n: PNode, indent: int = 0, maxRecDepth: int = - 1): Rope =
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = treeToYamlAux(conf, n, marker, indent, maxRecDepth)
 
 proc typeToYaml(conf: ConfigRef; n: PType, indent: int = 0, maxRecDepth: int = - 1): Rope =
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = typeToYamlAux(conf, n, marker, indent, maxRecDepth)
 
 proc symToYaml(conf: ConfigRef; n: PSym, indent: int = 0, maxRecDepth: int = - 1): Rope =
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = symToYamlAux(conf, n, marker, indent, maxRecDepth)
 
 import tables
diff --git a/compiler/ccgmerge.nim b/compiler/ccgmerge.nim
index a87d5b609c85f..2fa16c6bc09de 100644
--- a/compiler/ccgmerge.nim
+++ b/compiler/ccgmerge.nim
@@ -12,7 +12,7 @@
 
 import
   ast, ropes, options, strutils, nimlexbase, cgendata, rodutils,
-  intsets, llstream, tables, modulegraphs, pathutils
+  ordsets, llstream, tables, modulegraphs, pathutils
 
 # Careful! Section marks need to contain a tabulator so that they cannot
 # be part of C string literals.
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim
index 6c82a140beb10..ee81e34a6a759 100644
--- a/compiler/ccgtypes.nim
+++ b/compiler/ccgtypes.nim
@@ -423,7 +423,7 @@ proc getTypeDescWeak(m: BModule; t: PType; check: var IntSet; kind: TSymKind): R
     result = getTypeDescAux(m, t, check, kind)
 
 proc getSeqPayloadType(m: BModule; t: PType): Rope =
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   result = getTypeDescWeak(m, t, check, skParam) & "_Content"
   #result = getTypeForward(m, t, hashType(t)) & "_Content"
 
@@ -587,7 +587,7 @@ proc getRecordFields(m: BModule, typ: PType, check: var IntSet): Rope =
 proc fillObjectFields*(m: BModule; typ: PType) =
   # sometimes generic objects are not consistently merged. We patch over
   # this fact here.
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   discard getRecordFields(m, typ, check)
 
 proc mangleDynLibProc(sym: PSym): Rope
@@ -931,7 +931,7 @@ proc getTypeDescAux(m: BModule, origTyp: PType, check: var IntSet; kind: TSymKin
   excl(check, t.id)
 
 proc getTypeDesc(m: BModule, typ: PType; kind = skParam): Rope =
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   result = getTypeDescAux(m, typ, check, kind)
 
 type
@@ -942,7 +942,7 @@ type
 
 proc getClosureType(m: BModule, t: PType, kind: TClosureTypeKind): Rope =
   assert t.kind == tyProc
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   result = getTempName(m)
   var rettype, desc: Rope
   genProcParams(m, t, rettype, desc, check, declareEnvironment=kind != clHalf)
@@ -958,7 +958,7 @@ proc getClosureType(m: BModule, t: PType, kind: TClosureTypeKind): Rope =
 
 proc finishTypeDescriptions(m: BModule) =
   var i = 0
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   while i < m.typeStack.len:
     let t = m.typeStack[i]
     if optSeqDestructors in m.config.globalOptions and t.skipTypes(abstractInst).kind == tySequence:
@@ -990,7 +990,7 @@ proc genProcHeader(m: BModule, prc: PSym, asPtr: bool = false): Rope =
     result.add "static "
   elif sfImportc notin prc.flags:
     result.add "N_LIB_PRIVATE "
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   fillLoc(prc.loc, locProc, prc.ast[namePos], mangleName(m, prc), OnUnknown)
   genProcParams(m, prc.typ, rettype, params, check)
   # handle the 2 options for hotcodereloading codegen - function pointer
diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 9a50b718c7e90..a5b25a9da2a26 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -10,7 +10,7 @@
 ## This module implements the C code generator.
 
 import
-  ast, astalgo, hashes, trees, platform, magicsys, extccomp, options, intsets,
+  ast, astalgo, hashes, trees, platform, magicsys, extccomp, options, ordsets,
   nversion, nimsets, msgs, bitsets, idents, types,
   ccgutils, os, ropes, math, passes, wordrecg, treetab, cgmeth,
   rodutils, renderer, cgendata, ccgmerge, aliases,
@@ -976,7 +976,7 @@ proc getProcTypeCast(m: BModule, prc: PSym): Rope =
   result = getTypeDesc(m, prc.loc.t)
   if prc.typ.callConv == ccClosure:
     var rettype, params: Rope
-    var check = initIntSet()
+    var check = initOrdSet[int]()
     genProcParams(m, prc.typ, rettype, params, check)
     result = "$1(*)$2" % [rettype, params]
 
@@ -1803,8 +1803,8 @@ proc rawNewModule(g: BModuleList; module: PSym, filename: AbsoluteFile): BModule
   result.g = g
   result.tmpBase = rope("TM" & $hashOwner(module) & "_")
   result.headerFiles = @[]
-  result.declaredThings = initIntSet()
-  result.declaredProtos = initIntSet()
+  result.declaredThings = initOrdSet[int]()
+  result.declaredProtos = initOrdSet[int]()
   result.cfilename = filename
   result.filename = filename
   result.typeCache = initTable[SigHash, Rope]()
diff --git a/compiler/cgendata.nim b/compiler/cgendata.nim
index 8e509433663c6..bbb2d7d20d285 100644
--- a/compiler/cgendata.nim
+++ b/compiler/cgendata.nim
@@ -10,7 +10,7 @@
 ## This module contains the data structures for the C code generation phase.
 
 import
-  ast, ropes, options, intsets,
+  ast, ropes, options, ordsets,
   tables, ndi, lineinfos, pathutils, modulegraphs, sets
 
 type
@@ -201,7 +201,7 @@ proc newProc*(prc: PSym, module: BModule): BProc =
 
 proc newModuleList*(g: ModuleGraph): BModuleList =
   BModuleList(typeInfoMarker: initTable[SigHash, tuple[str: Rope, owner: PSym]](),
-    config: g.config, graph: g, nimtvDeclared: initIntSet())
+    config: g.config, graph: g, nimtvDeclared: initOrdSet[int]())
 
 iterator cgenModules*(g: BModuleList): BModule =
   for m in g.modulesClosed:
diff --git a/compiler/cgmeth.nim b/compiler/cgmeth.nim
index 9b871a8983785..66064af186212 100644
--- a/compiler/cgmeth.nim
+++ b/compiler/cgmeth.nim
@@ -10,7 +10,7 @@
 ## This module implements code generation for methods.
 
 import
-  intsets, options, ast, msgs, idents, renderer, types, magicsys,
+  ordsets, options, ast, msgs, idents, renderer, types, magicsys,
   sempass2, strutils, modulegraphs, lineinfos
 
 proc genConv(n: PNode, d: PType, downcast: bool; conf: ConfigRef): PNode =
@@ -286,7 +286,7 @@ proc genDispatcher(g: ModuleGraph; methods: seq[PSym], relevantCols: IntSet): PS
 proc generateMethodDispatchers*(g: ModuleGraph): PNode =
   result = newNode(nkStmtList)
   for bucket in 0..<g.methods.len:
-    var relevantCols = initIntSet()
+    var relevantCols = initOrdSet[int]()
     for col in 1..<g.methods[bucket].methods[0].typ.len:
       if relevantCol(g.methods[bucket].methods, col): incl(relevantCols, col)
       if optMultiMethods notin g.config.globalOptions:
diff --git a/compiler/dfa.nim b/compiler/dfa.nim
index d07122552c88f..1b5ff9c9e1fa2 100644
--- a/compiler/dfa.nim
+++ b/compiler/dfa.nim
@@ -29,7 +29,7 @@
 ## "A Graph–Free Approach to Data–Flow Analysis" by Markus Mohnen.
 ## https://link.springer.com/content/pdf/10.1007/3-540-45937-5_6.pdf
 
-import ast, types, intsets, lineinfos, renderer, asciitables
+import ast, types, ordsets, lineinfos, renderer, asciitables
 
 from patterns import sameTrees
 
@@ -64,7 +64,7 @@ type
 proc codeListing(c: ControlFlowGraph, start = 0; last = -1): string =
   # for debugging purposes
   # first iteration: compute all necessary labels:
-  var jumpTargets = initIntSet()
+  var jumpTargets = initOrdSet[int]()
   let last = if last < 0: c.len-1 else: min(last, c.len-1)
   for i in start..last:
     if c[i].kind in {goto, fork}:
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
index fb15f382677f1..85f7a4c9a4e53 100644
--- a/compiler/docgen.nim
+++ b/compiler/docgen.nim
@@ -16,7 +16,7 @@ import
   wordrecg, syntaxes, renderer, lexer, packages/docutils/rstast,
   packages/docutils/rst, packages/docutils/rstgen,
   json, xmltree, cgi, trees, types,
-  typesrenderer, astalgo, lineinfos, intsets,
+  typesrenderer, astalgo, lineinfos, ordsets,
   pathutils, trees, tables, nimpaths, renderverbatim, osproc
 
 from std/private/globs import nativeToUnixPath
@@ -229,7 +229,7 @@ proc newDocumentor*(filename: AbsoluteFile; cache: IdentCache; conf: ConfigRef,
       let (output, gotten) = execCmdEx(cmd)
       if gotten != status:
         rawMessage(conf, errGenerated, "snippet failed: cmd: '$1' status: $2 expected: $3 output: $4" % [cmd, $gotten, $status, output])
-  result.emitted = initIntSet()
+  result.emitted = initOrdSet[int]()
   result.destFile = getOutFile2(conf, presentationPath(conf, filename), outExt, false)
   result.thisDir = result.destFile.splitFile.dir
 
diff --git a/compiler/idgen.nim b/compiler/idgen.nim
index 7d49e33e3e7ff..9ac243c030428 100644
--- a/compiler/idgen.nim
+++ b/compiler/idgen.nim
@@ -17,9 +17,9 @@ const
   debugIds* = false
 
 when debugIds:
-  import intsets
+  import ordsets
 
-  var usedIds = initIntSet()
+  var usedIds = initOrdSet[int]()
 
 proc registerID*(id: PIdObj) =
   when debugIds:
diff --git a/compiler/importer.nim b/compiler/importer.nim
index 34e76d7d93cbc..9958d76b7e65e 100644
--- a/compiler/importer.nim
+++ b/compiler/importer.nim
@@ -10,12 +10,12 @@
 ## This module implements the symbol importing mechanism.
 
 import
-  intsets, ast, astalgo, msgs, options, idents, lookups,
+  ordsets, ast, astalgo, msgs, options, idents, lookups,
   semdata, modulepaths, sigmatch, lineinfos, sets
 
 proc readExceptSet*(c: PContext, n: PNode): IntSet =
   assert n.kind in {nkImportExceptStmt, nkExportExceptStmt}
-  result = initIntSet()
+  result = initOrdSet[int]()
   for i in 1..<n.len:
     let ident = lookups.considerQuotedIdent(c, n[i])
     result.incl(ident.id)
diff --git a/compiler/incremental.nim b/compiler/incremental.nim
index 8b3a9bf5569c5..1a0e66f11900f 100644
--- a/compiler/incremental.nim
+++ b/compiler/incremental.nim
@@ -15,7 +15,7 @@ const nimIncremental* = defined(nimIncremental)
 import options, lineinfos
 
 when nimIncremental:
-  import ast, msgs, intsets, btrees, db_sqlite, std / sha1, pathutils
+  import ast, msgs, ordsets, btrees, db_sqlite, std / sha1, pathutils
   from strutils import parseInt
   from os import isAbsolute
 
@@ -39,8 +39,8 @@ when nimIncremental:
   proc init*(incr: var IncrementalCtx) =
     incr.w.sstack = @[]
     incr.w.tstack = @[]
-    incr.w.tmarks = initIntSet()
-    incr.w.smarks = initIntSet()
+    incr.w.tmarks = initOrdSet[int]()
+    incr.w.smarks = initOrdSet[int]()
     incr.w.forwardedSyms = @[]
     incr.r.syms = initBTree[int, PSym]()
     incr.r.types = initBTree[int, PType]()
diff --git a/compiler/injectdestructors.nim b/compiler/injectdestructors.nim
index b18bcf34e1318..44e317a59363d 100644
--- a/compiler/injectdestructors.nim
+++ b/compiler/injectdestructors.nim
@@ -14,7 +14,7 @@
 ## See doc/destructors.rst for a spec of the implemented rewrite rules
 
 import
-  intsets, strtabs, ast, astalgo, msgs, renderer, magicsys, types, idents,
+  ordsets, strtabs, ast, astalgo, msgs, renderer, magicsys, types, idents,
   strutils, options, dfa, lowerings, tables, modulegraphs, msgs,
   lineinfos, parampatterns, sighashes, liftdestructors, optimizer,
   varpartitions
@@ -200,8 +200,8 @@ proc initialized(code: ControlFlowGraph; pc: int,
     of goto:
       pc += code[pc].dest
     of fork:
-      var initA = initIntSet()
-      var initB = initIntSet()
+      var initA = initOrdSet[int]()
+      var initB = initOrdSet[int]()
       var variantA = pc + 1
       var variantB = pc + code[pc].dest
       while variantA != variantB:
@@ -987,8 +987,8 @@ proc moveOrCopy(dest, ri: PNode; c: var Con; s: var Scope, isDecl = false): PNod
 proc computeUninit(c: var Con) =
   if not c.uninitComputed:
     c.uninitComputed = true
-    c.uninit = initIntSet()
-    var init = initIntSet()
+    c.uninit = initOrdSet[int]()
+    var init = initOrdSet[int]()
     discard initialized(c.g, pc = 0, init, c.uninit, int.high)
 
 proc injectDefaultCalls(n: PNode, c: var Con) =
diff --git a/compiler/isolation_check.nim b/compiler/isolation_check.nim
index f3b0c49199ae0..cd7c3ab24d9b0 100644
--- a/compiler/isolation_check.nim
+++ b/compiler/isolation_check.nim
@@ -11,7 +11,7 @@
 ## https://github.com/nim-lang/RFCs/issues/244 for more details.
 
 import
-  ast, types, renderer, idents, intsets
+  ast, types, renderer, idents, ordsets
 
 proc canAlias(arg, ret: PType; marker: var IntSet): bool
 
@@ -65,7 +65,7 @@ proc canAlias(arg, ret: PType; marker: var IntSet): bool =
     result = false
 
 proc canAlias*(arg, ret: PType): bool =
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = canAlias(arg, ret, marker)
 
 proc checkIsolate*(n: PNode): bool =
diff --git a/compiler/jsgen.nim b/compiler/jsgen.nim
index bea5225e645dd..97ebea61a1bf1 100644
--- a/compiler/jsgen.nim
+++ b/compiler/jsgen.nim
@@ -32,7 +32,7 @@ import
   ast, strutils, trees, magicsys, options,
   nversion, msgs, idents, types, tables,
   ropes, math, passes, ccgutils, wordrecg, renderer,
-  intsets, cgmeth, lowerings, sighashes, modulegraphs, lineinfos, rodutils,
+  ordsets, cgmeth, lowerings, sighashes, modulegraphs, lineinfos, rodutils,
   transf, injectdestructors, sourcemap, json, sets
 
 
@@ -133,8 +133,8 @@ template nested(p, body) =
 proc newGlobals(): PGlobals =
   new(result)
   result.forwarded = @[]
-  result.generatedSyms = initIntSet()
-  result.typeInfoGenerated = initIntSet()
+  result.generatedSyms = initOrdSet[int]()
+  result.typeInfoGenerated = initOrdSet[int]()
 
 proc initCompRes(r: var TCompRes) =
   r.address = nil
@@ -1705,7 +1705,7 @@ proc createVar(p: PProc, typ: PType, indirect: bool): Rope =
     if indirect: result = "[$1]" % [result]
   of tyObject:
     var initList: Rope
-    createObjInitList(p, t, initIntSet(), initList)
+    createObjInitList(p, t, initOrdSet[int](), initList)
     result = ("({$1})") % [initList]
     if indirect: result = "[$1]" % [result]
   of tyVar, tyPtr, tyLent, tyRef, tyPointer:
@@ -2163,7 +2163,7 @@ proc genObjConstr(p: PProc, n: PNode, r: var TCompRes) =
   var a: TCompRes
   r.kind = resExpr
   var initList : Rope
-  var fieldIDs = initIntSet()
+  var fieldIDs = initOrdSet[int]()
   for i in 1..<n.len:
     if i > 1: initList.add(", ")
     var it = n[i]
diff --git a/compiler/lambdalifting.nim b/compiler/lambdalifting.nim
index c23ca52cb22b8..770173ca04a1f 100644
--- a/compiler/lambdalifting.nim
+++ b/compiler/lambdalifting.nim
@@ -10,7 +10,7 @@
 # This file implements lambda lifting for the transformator.
 
 import
-  intsets, strutils, options, ast, astalgo, msgs,
+  ordsets, strutils, options, ast, astalgo, msgs,
   idents, renderer, types, magicsys, lowerings, tables, modulegraphs, lineinfos,
   transf, liftdestructors
 
@@ -307,8 +307,8 @@ type
     graph: ModuleGraph
 
 proc initDetectionPass(g: ModuleGraph; fn: PSym): DetectionPass =
-  result.processed = initIntSet()
-  result.capturedVars = initIntSet()
+  result.processed = initOrdSet[int]()
+  result.capturedVars = initOrdSet[int]()
   result.ownerToType = initTable[int, PType]()
   result.processed.incl(fn.id)
   result.graph = g
@@ -513,7 +513,7 @@ type
     unownedEnvVars: Table[int, PNode] # only required for --newruntime
 
 proc initLiftingPass(fn: PSym): LiftingPass =
-  result.processed = initIntSet()
+  result.processed = initOrdSet[int]()
   result.processed.incl(fn.id)
   result.envVars = initTable[int, PNode]()
 
diff --git a/compiler/lookups.nim b/compiler/lookups.nim
index 744f77cf8c3af..f3d68f84199b7 100644
--- a/compiler/lookups.nim
+++ b/compiler/lookups.nim
@@ -10,7 +10,7 @@
 # This module implements lookup helpers.
 
 import
-  intsets, ast, astalgo, idents, semdata, types, msgs, options,
+  ordsets, ast, astalgo, idents, semdata, types, msgs, options,
   renderer, nimfix/prettybase, lineinfos, strutils
 
 proc ensureNoMissingOrUnusedSymbols(c: PContext; scope: PScope)
@@ -420,7 +420,7 @@ proc initOverloadIter*(o: var TOverloadIter, c: PContext, n: PNode): PSym =
       o.mode = oimDone
       return nil
     o.symChoiceIndex = 1
-    o.inSymChoice = initIntSet()
+    o.inSymChoice = initOrdSet[int]()
     incl(o.inSymChoice, result.id)
   else: discard
   when false:
diff --git a/compiler/modulegraphs.nim b/compiler/modulegraphs.nim
index da2a222a4a138..f2d63570e3574 100644
--- a/compiler/modulegraphs.nim
+++ b/compiler/modulegraphs.nim
@@ -25,7 +25,7 @@
 ## - Its dependent module stays the same.
 ##
 
-import ast, intsets, tables, options, lineinfos, hashes, idents,
+import ast, ordsets, tables, options, lineinfos, hashes, idents,
   incremental, btrees, md5
 
 type
@@ -172,7 +172,7 @@ proc createMagic*(g: ModuleGraph; name: string, m: TMagic): PSym =
 proc newModuleGraph*(cache: IdentCache; config: ConfigRef): ModuleGraph =
   result = ModuleGraph()
   initStrTable(result.packageSyms)
-  result.deps = initIntSet()
+  result.deps = initOrdSet[int]()
   result.importDeps = initTable[FileIndex, seq[FileIndex]]()
   result.modules = @[]
   result.importStack = @[]
@@ -197,7 +197,7 @@ proc newModuleGraph*(cache: IdentCache; config: ConfigRef): ModuleGraph =
 
 proc resetAllModules*(g: ModuleGraph) =
   initStrTable(g.packageSyms)
-  g.deps = initIntSet()
+  g.deps = initOrdSet[int]()
   g.modules = @[]
   g.importStack = @[]
   g.inclToMod = initTable[FileIndex, FileIndex]()
diff --git a/compiler/optimizer.nim b/compiler/optimizer.nim
index 5d1139bfdb378..d43ad7d9ab30f 100644
--- a/compiler/optimizer.nim
+++ b/compiler/optimizer.nim
@@ -12,7 +12,7 @@
 ## - recognize "all paths lead to 'wasMoved(x)'"
 
 import
-  ast, renderer, idents, intsets
+  ast, renderer, idents, ordsets
 
 from trees import exprStructuralEquivalent
 
@@ -72,7 +72,7 @@ proc wasMovedTarget(matches: var IntSet; branch: seq[PNode]; moveTarget: PNode):
 proc intersect(summary: var seq[PNode]; branch: seq[PNode]) =
   # keep all 'wasMoved(x)' calls in summary that are also in 'branch':
   var i = 0
-  var matches = initIntSet()
+  var matches = initOrdSet[int]()
   while i < summary.len:
     if wasMovedTarget(matches, branch, summary[i][1].skipAddr):
       inc i
diff --git a/compiler/reorder.nim b/compiler/reorder.nim
index 72f8666a2e495..8c51f93900890 100644
--- a/compiler/reorder.nim
+++ b/compiler/reorder.nim
@@ -1,6 +1,6 @@
 
 import
-  intsets, ast, idents, algorithm, renderer, strutils,
+  ordsets, ast, idents, algorithm, renderer, strutils,
   msgs, modulegraphs, syntaxes, options, modulepaths,
   lineinfos
 
@@ -404,15 +404,15 @@ proc hasForbiddenPragma(n: PNode): bool =
 proc reorder*(graph: ModuleGraph, n: PNode, module: PSym): PNode =
   if n.hasForbiddenPragma:
     return n
-  var includedFiles = initIntSet()
+  var includedFiles = initOrdSet[int]()
   let mpath = toFullPath(graph.config, module.fileIdx)
   let n = expandIncludes(graph, module, n, mpath,
                           includedFiles).splitSections
   result = newNodeI(nkStmtList, n.info)
   var deps = newSeq[(IntSet, IntSet)](n.len)
   for i in 0..<n.len:
-    deps[i][0] = initIntSet()
-    deps[i][1] = initIntSet()
+    deps[i][0] = initOrdSet[int]()
+    deps[i][1] = initOrdSet[int]()
     computeDeps(graph.cache, n[i], deps[i][0], deps[i][1], true)
 
   var g = buildGraph(n, deps)
diff --git a/compiler/rodimpl.nim b/compiler/rodimpl.nim
index e50ab66de0eeb..a6e02c910d75c 100644
--- a/compiler/rodimpl.nim
+++ b/compiler/rodimpl.nim
@@ -9,7 +9,7 @@
 
 ## This module implements the new compilation cache.
 
-import strutils, intsets, tables, ropes, db_sqlite, msgs, options,
+import strutils, ordsets, tables, ropes, db_sqlite, msgs, options,
   renderer, rodutils, idents, astalgo, btrees, magicsys, cgmeth, extccomp,
   btrees, trees, condsyms, nversion, pathutils
 
@@ -71,7 +71,7 @@ proc getModuleId(g: ModuleGraph; fileIdx: FileIndex; fullpath: AbsoluteFile): in
     if currentFullhash == module[1]:
       # not changed, so use the cached AST:
       doAssert(result != 0)
-      var cycleCheck = initIntSet()
+      var cycleCheck = initOrdSet[int]()
       if not needsRecompile(g, fileIdx, fullpath, cycleCheck):
         if not g.incr.configChanged or g.config.symbolFiles == readOnlySf:
           #echo "cached successfully! ", string fullpath
diff --git a/compiler/sem.nim b/compiler/sem.nim
index bc61194605d63..cc48e9e6684de 100644
--- a/compiler/sem.nim
+++ b/compiler/sem.nim
@@ -14,7 +14,7 @@ import
   wordrecg, ropes, msgs, idents, renderer, types, platform, math,
   magicsys, nversion, nimsets, semfold, modulepaths, importer,
   procfind, lookups, pragmas, passes, semdata, semtypinst, sigmatch,
-  intsets, transf, vmdef, vm, idgen, aliases, cgmeth, lambdalifting,
+  ordsets, transf, vmdef, vm, idgen, aliases, cgmeth, lambdalifting,
   evaltempl, patterns, parampatterns, sempass2, linter, semmacrosanity,
   lowerings, plugins/active, rod, lineinfos, strtabs, int128,
   isolation_check, typeallowed
diff --git a/compiler/semdata.nim b/compiler/semdata.nim
index b15f65967505b..2bba73eefe019 100644
--- a/compiler/semdata.nim
+++ b/compiler/semdata.nim
@@ -10,7 +10,7 @@
 ## This module contains the data structures for the semantic checking phase.
 
 import
-  intsets, options, ast, astalgo, msgs, idents, renderer,
+  ordsets, options, ast, astalgo, msgs, idents, renderer,
   magicsys, vmdef, modulegraphs, lineinfos, sets
 
 type
@@ -238,18 +238,18 @@ proc popOptionEntry*(c: PContext) =
 proc newContext*(graph: ModuleGraph; module: PSym): PContext =
   new(result)
   result.enforceVoidContext = PType(kind: tyTyped)
-  result.ambiguousSymbols = initIntSet()
+  result.ambiguousSymbols = initOrdSet[int]()
   result.optionStack = @[newOptionEntry(graph.config)]
   result.libs = @[]
   result.module = module
   result.friendModules = @[module]
   result.converters = @[]
   result.patterns = @[]
-  result.includedFiles = initIntSet()
+  result.includedFiles = initOrdSet[int]()
   initStrTable(result.pureEnumFields)
   initStrTable(result.userPragmas)
   result.generics = @[]
-  result.unknownIdents = initIntSet()
+  result.unknownIdents = initOrdSet[int]()
   result.cache = graph.cache
   result.graph = graph
   initStrTable(result.signatures)
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index cb852c68ae17d..a28d495c73f18 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -2452,7 +2452,7 @@ proc semTupleFieldsConstr(c: PContext, n: PNode, flags: TExprFlags): PNode =
   result = newNodeI(nkTupleConstr, n.info)
   var typ = newTypeS(tyTuple, c)
   typ.n = newNodeI(nkRecList, n.info) # nkIdentDefs
-  var ids = initIntSet()
+  var ids = initOrdSet[int]()
   for i in 0..<n.len:
     if n[i].kind != nkExprColonExpr:
       illFormedAst(n[i], c.config)
diff --git a/compiler/semgnrc.nim b/compiler/semgnrc.nim
index a80b1d0571cc1..266335433c3c7 100644
--- a/compiler/semgnrc.nim
+++ b/compiler/semgnrc.nim
@@ -496,15 +496,15 @@ proc semGenericStmt(c: PContext, n: PNode,
 
 proc semGenericStmt(c: PContext, n: PNode): PNode =
   var ctx: GenericCtx
-  ctx.toMixin = initIntSet()
-  ctx.toBind = initIntSet()
+  ctx.toMixin = initOrdSet[int]()
+  ctx.toBind = initOrdSet[int]()
   result = semGenericStmt(c, n, {}, ctx)
   semIdeForTemplateOrGeneric(c, result, ctx.cursorInBody)
 
 proc semConceptBody(c: PContext, n: PNode): PNode =
   var ctx: GenericCtx
-  ctx.toMixin = initIntSet()
-  ctx.toBind = initIntSet()
+  ctx.toMixin = initOrdSet[int]()
+  ctx.toBind = initOrdSet[int]()
   result = semGenericStmt(c, n, {withinConcept}, ctx)
   semIdeForTemplateOrGeneric(c, result, ctx.cursorInBody)
 
diff --git a/compiler/semobjconstr.nim b/compiler/semobjconstr.nim
index 64a27d1db25bb..bb2197f8ca7b1 100644
--- a/compiler/semobjconstr.nim
+++ b/compiler/semobjconstr.nim
@@ -95,7 +95,7 @@ proc caseBranchMatchesExpr(branch, matched: PNode): bool =
 proc branchVals(c: PContext, caseNode: PNode, caseIdx: int,
                 isStmtBranch: bool): IntSet =
   if caseNode[caseIdx].kind == nkOfBranch:
-    result = initIntSet()
+    result = initOrdSet[int]()
     for val in processBranchVals(caseNode[caseIdx]):
       result.incl(val)
   else:
diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim
index 5eb464bb80255..cc8846bc05f63 100644
--- a/compiler/sempass2.nim
+++ b/compiler/sempass2.nim
@@ -8,7 +8,7 @@
 #
 
 import
-  intsets, ast, astalgo, msgs, renderer, magicsys, types, idents, trees,
+  ordsets, ast, astalgo, msgs, renderer, magicsys, types, idents, trees,
   wordrecg, strutils, options, guards, lineinfos, semfold, semdata,
   modulegraphs, varpartitions, typeallowed
 
@@ -255,7 +255,7 @@ proc listGcUnsafety(s: PSym; onlyWarning: bool; cycleCheck: var IntSet; conf: Co
         "'$#' is not GC-safe as it performs an indirect call here" % s.name.s)
 
 proc listGcUnsafety(s: PSym; onlyWarning: bool; conf: ConfigRef) =
-  var cycleCheck = initIntSet()
+  var cycleCheck = initOrdSet[int]()
   listGcUnsafety(s, onlyWarning, cycleCheck, conf)
 
 proc useVarNoInitCheck(a: PEffects; n: PNode; s: PSym) =
@@ -1147,7 +1147,7 @@ proc checkRaisesSpec(g: ModuleGraph; spec, real: PNode, msg: string, hints: bool
                      hintsArg: PNode = nil) =
   # check that any real exception is listed in 'spec'; mark those as used;
   # report any unused exception
-  var used = initIntSet()
+  var used = initOrdSet[int]()
   for r in items(real):
     block search:
       for s in 0..<spec.len:
diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index 44a31c2ea6e0a..6b98a7b55ccac 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -182,7 +182,7 @@ proc semIf(c: PContext, n: PNode; flags: TExprFlags): PNode =
     result.typ = typ
 
 proc semTry(c: PContext, n: PNode; flags: TExprFlags): PNode =
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   template semExceptBranchType(typeNode: PNode): bool =
     # returns true if exception type is imported type
     let typ = semTypeNode(c, typeNode, nil).toObject()
diff --git a/compiler/semtempl.nim b/compiler/semtempl.nim
index df832c814f324..82f72f95c8da3 100644
--- a/compiler/semtempl.nim
+++ b/compiler/semtempl.nim
@@ -642,9 +642,9 @@ proc semTemplateDef(c: PContext, n: PNode): PNode =
   if n[patternPos].kind != nkEmpty:
     n[patternPos] = semPattern(c, n[patternPos])
   var ctx: TemplCtx
-  ctx.toBind = initIntSet()
-  ctx.toMixin = initIntSet()
-  ctx.toInject = initIntSet()
+  ctx.toBind = initOrdSet[int]()
+  ctx.toMixin = initOrdSet[int]()
+  ctx.toInject = initOrdSet[int]()
   ctx.c = c
   ctx.owner = s
   if sfDirty in s.flags:
@@ -791,9 +791,9 @@ proc semPatternBody(c: var TemplCtx, n: PNode): PNode =
 proc semPattern(c: PContext, n: PNode): PNode =
   openScope(c)
   var ctx: TemplCtx
-  ctx.toBind = initIntSet()
-  ctx.toMixin = initIntSet()
-  ctx.toInject = initIntSet()
+  ctx.toBind = initOrdSet[int]()
+  ctx.toMixin = initOrdSet[int]()
+  ctx.toInject = initOrdSet[int]()
   ctx.c = c
   ctx.owner = getCurrOwner(c)
   result = flattenStmts(semPatternBody(ctx, n))
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index 9bb7673fafa1a..a2522c5a50185 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -435,7 +435,7 @@ proc semTuple(c: PContext, n: PNode, prev: PType): PType =
   var typ: PType
   result = newOrPrevType(tyTuple, prev, c)
   result.n = newNodeI(nkRecList, n.info)
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   var counter = 0
   for i in ord(n.kind == nkBracketExpr)..<n.len:
     var a = n[i]
@@ -604,7 +604,7 @@ proc semRecordNodeAux(c: PContext, n: PNode, check: var IntSet, pos: var int,
                       father: PNode, rectype: PType, hasCaseFields = false)
 
 proc getIntSetOfType(c: PContext, t: PType): IntSet =
-  result = initIntSet()
+  result = initOrdSet[int]()
   if t.enumHasHoles:
     let t = t.skipTypes(abstractRange)
     for field in t.n.sons:
@@ -648,7 +648,7 @@ proc renderAsType(vals: IntSet, t: PType): string =
   result &= "}"
 
 proc formatMissingEnums(c: PContext, n: PNode): string =
-  var coveredCases = initIntSet()
+  var coveredCases = initOrdSet[int]()
   for i in 1..<n.len:
     for val in processBranchVals(n[i]):
       coveredCases.incl val
@@ -843,7 +843,7 @@ proc addInheritedFields(c: PContext, check: var IntSet, pos: var int,
 proc semObjectNode(c: PContext, n: PNode, prev: PType; isInheritable: bool): PType =
   if n.len == 0:
     return newConstraint(c, tyObject)
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   var pos = 0
   var base, realBase: PType = nil
   # n[0] contains the pragmas (if any). We process these later...
@@ -1188,7 +1188,7 @@ proc semProcTypeNode(c: PContext, n, genericParams: PNode,
   # lists too and then 'isType' is false.
   checkMinSonsLen(n, 1, c.config)
   result = newProcType(c, n.info, prev)
-  var check = initIntSet()
+  var check = initOrdSet[int]()
   var counter = 0
 
   for i in 1..<n.len:
@@ -1384,7 +1384,7 @@ proc semGenericParamInInvocation(c: PContext, n: PNode): PType =
 
 proc semObjectTypeForInheritedGenericInst(c: PContext, n: PNode, t: PType) =
   var
-    check = initIntSet()
+    check = initOrdSet[int]()
     pos = 0
   let
     realBase = t[0]
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
index 1441203e8d434..4dda8c69a23fe 100644
--- a/compiler/sigmatch.nim
+++ b/compiler/sigmatch.nim
@@ -11,7 +11,7 @@
 ## the call to overloaded procs, generic procs and operators.
 
 import
-  intsets, ast, astalgo, semdata, types, msgs, renderer, lookups, semtypinst,
+  ordsets, ast, astalgo, semdata, types, msgs, renderer, lookups, semtypinst,
   magicsys, idents, lexer, options, parampatterns, strutils, trees,
   linter, lineinfos, lowerings, modulegraphs
 
@@ -2512,7 +2512,7 @@ proc semFinishOperands*(c: PContext, n: PNode) =
 
 proc partialMatch*(c: PContext, n, nOrig: PNode, m: var TCandidate) =
   # for 'suggest' support:
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   matchesAux(c, n, nOrig, m, marker)
 
 proc matches*(c: PContext, n, nOrig: PNode, m: var TCandidate) =
@@ -2525,7 +2525,7 @@ proc matches*(c: PContext, n, nOrig: PNode, m: var TCandidate) =
       inc m.genericMatches
       inc m.exactMatches
     return
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   matchesAux(c, n, nOrig, m, marker)
   if m.state == csNoMatch: return
   # check that every formal parameter got a value:
diff --git a/compiler/typeallowed.nim b/compiler/typeallowed.nim
index a8210508c468c..5142e25069cc3 100644
--- a/compiler/typeallowed.nim
+++ b/compiler/typeallowed.nim
@@ -11,7 +11,7 @@
 ## for invalid types like 'openArray[var int]'.
 
 import
-  intsets, ast, renderer, options, semdata, types
+  ordsets, ast, renderer, options, semdata, types
 
 type
   TTypeAllowedFlag* = enum
@@ -184,7 +184,7 @@ proc typeAllowedAux(marker: var IntSet, typ: PType, kind: TSymKind,
 proc typeAllowed*(t: PType, kind: TSymKind; c: PContext; flags: TTypeAllowedFlags = {}): PType =
   # returns 'nil' on success and otherwise the part of the type that is
   # wrong!
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = typeAllowedAux(marker, t, kind, c, flags)
 
 type
@@ -244,7 +244,7 @@ proc classifyViewTypeAux(marker: var IntSet, t: PType): ViewTypeKind =
     result = noView
 
 proc classifyViewType*(t: PType): ViewTypeKind =
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = classifyViewTypeAux(marker, t)
 
 proc directViewType*(t: PType): ViewTypeKind =
diff --git a/compiler/types.nim b/compiler/types.nim
index b20bf9c06c766..d6761e2cd0e4f 100644
--- a/compiler/types.nim
+++ b/compiler/types.nim
@@ -10,7 +10,7 @@
 # this module contains routines for accessing and iterating over types
 
 import
-  intsets, ast, astalgo, trees, msgs, strutils, platform, renderer, options,
+  ordsets, ast, astalgo, trees, msgs, strutils, platform, renderer, options,
   lineinfos, int128
 
 type
@@ -203,7 +203,7 @@ proc iterOverTypeAux(marker: var IntSet, t: PType, iter: TTypeIter,
       if t.n != nil and t.kind != tyProc: result = iterOverNode(marker, t.n, iter, closure)
 
 proc iterOverType(t: PType, iter: TTypeIter, closure: RootRef): bool =
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = iterOverTypeAux(marker, t, iter, closure)
 
 proc searchTypeForAux(t: PType, predicate: TTypePredicate,
@@ -254,7 +254,7 @@ proc searchTypeForAux(t: PType, predicate: TTypePredicate,
     discard
 
 proc searchTypeFor*(t: PType, predicate: TTypePredicate): bool =
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = searchTypeForAux(t, predicate, marker)
 
 proc isObjectPredicate(t: PType): bool =
@@ -307,7 +307,7 @@ proc analyseObjectWithTypeField*(t: PType): TTypeFieldResult =
   # this does a complex analysis whether a call to ``objectInit`` needs to be
   # made or initializing of the type field suffices or if there is no type field
   # at all in this type.
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = analyseObjectWithTypeFieldAux(t, marker)
 
 proc isGCRef(t: PType): bool =
@@ -386,7 +386,7 @@ proc isFinal*(t: PType): bool =
   result = t.kind != tyObject or tfFinal in t.flags or isPureObject(t)
 
 proc canFormAcycle*(typ: PType): bool =
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = canFormAcycleAux(marker, typ, typ.id)
 
 proc mutateTypeAux(marker: var IntSet, t: PType, iter: TTypeMutator,
@@ -417,7 +417,7 @@ proc mutateTypeAux(marker: var IntSet, t: PType, iter: TTypeMutator,
   assert(result != nil)
 
 proc mutateType(t: PType, iter: TTypeMutator, closure: RootRef): PType =
-  var marker = initIntSet()
+  var marker = initOrdSet[int]()
   result = mutateTypeAux(marker, t, iter, closure)
 
 proc valueToString(a: PNode): string =
@@ -1232,7 +1232,7 @@ proc commonSuperclass*(a, b: PType): PType =
   assert a.kind == tyObject
   assert b.kind == tyObject
   var x = a
-  var ancestors = initIntSet()
+  var ancestors = initOrdSet[int]()
   while x != nil:
     x = skipTypes(x, skipPtrs)
     ancestors.incl(x.id)
@@ -1376,7 +1376,7 @@ proc containsCompileTimeOnly*(t: PType): bool =
 proc safeSkipTypes*(t: PType, kinds: TTypeKinds): PType =
   ## same as 'skipTypes' but with a simple cycle detector.
   result = t
-  var seen = initIntSet()
+  var seen = initOrdSet[int]()
   while result.kind in kinds and not containsOrIncl(seen, result.id):
     result = lastSon(result)
 
@@ -1509,7 +1509,7 @@ proc isTupleRecursive(t: PType, cycleDetector: var IntSet): bool =
     return false
 
 proc isTupleRecursive*(t: PType): bool =
-  var cycleDetector = initIntSet()
+  var cycleDetector = initOrdSet[int]()
   isTupleRecursive(t, cycleDetector)
 
 proc isException*(t: PType): bool =
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index 6f81c6a9cfa2c..1712ec5b0a951 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -29,7 +29,7 @@
 
 import
   strutils, ast, types, msgs, renderer, vmdef,
-  intsets, magicsys, options, lowerings, lineinfos, transf
+  ordsets, magicsys, options, lowerings, lineinfos, transf
 
 const
   debugEchoCode* = defined(nimVMDebug)
@@ -52,7 +52,7 @@ proc debugInfo(c: PCtx; info: TLineInfo): string =
 proc codeListing(c: PCtx, result: var string, start=0; last = -1) =
   ## for debugging purposes
   # first iteration: compute all necessary labels:
-  var jumpTargets = initIntSet()
+  var jumpTargets = initOrdSet[int]()
   let last = if last < 0: c.code.len-1 else: min(last, c.code.len-1)
   for i in start..last:
     let x = c.code[i]
diff --git a/compiler/vmmarshal.nim b/compiler/vmmarshal.nim
index 696183943250b..999bd737a64e5 100644
--- a/compiler/vmmarshal.nim
+++ b/compiler/vmmarshal.nim
@@ -9,7 +9,7 @@
 
 ## Implements marshaling for the VM.
 
-import streams, json, intsets, tables, ast, astalgo, idents, types, msgs,
+import streams, json, ordsets, tables, ast, astalgo, idents, types, msgs,
   options, lineinfos
 
 proc ptrToInt(x: PNode): int {.inline.} =
@@ -130,7 +130,7 @@ proc storeAny(s: var string; t: PType; a: PNode; stored: var IntSet;
     internalError conf, a.info, "cannot marshal at compile-time " & t.typeToString
 
 proc storeAny*(s: var string; t: PType; a: PNode; conf: ConfigRef) =
-  var stored = initIntSet()
+  var stored = initOrdSet[int]()
   storeAny(s, t, a, stored, conf)
 
 proc loadAny(p: var JsonParser, t: PType,
diff --git a/doc/lib.rst b/doc/lib.rst
index e05657b42ed8f..8659b20360149 100644
--- a/doc/lib.rst
+++ b/doc/lib.rst
@@ -105,8 +105,8 @@ Collections
 * `heapqueue <heapqueue.html>`_
   Implementation of a heap data structure that can be used as a priority queue.
 
-* `intsets <intsets.html>`_
-  Efficient implementation of a set of ints as a sparse bit set.
+* `ordsets <ordsets.html>`_
+  Efficient implementation of a set of int and other ordinals as a sparse bit set.
 
 * `lists <lists.html>`_
   Nim linked list support. Contains singly and doubly linked lists and
diff --git a/drnim/drnim.nim b/drnim/drnim.nim
index b4761a3981307..5ed88fe93749c 100644
--- a/drnim/drnim.nim
+++ b/drnim/drnim.nim
@@ -18,7 +18,7 @@
 ]#
 
 import std / [
-  parseopt, strutils, os, tables, times, intsets, hashes
+  parseopt, strutils, os, tables, times, ordsets, hashes
 ]
 
 import ".." / compiler / [
@@ -987,7 +987,7 @@ proc traverseIf(c: DrnimContext; n: PNode) =
   for f in newFacts: c.facts.add((f, condVersion))
   # build the 'Phi' information:
   let varsWithoutFinals = c.varVersions.len
-  var mutatedVars = initIntSet()
+  var mutatedVars = initOrdSet[int]()
   for i in oldVars ..< varsWithoutFinals:
     let vv = c.varVersions[i]
     if not mutatedVars.containsOrIncl(vv):
diff --git a/lib/pure/collections/intsets.nim b/lib/pure/collections/intsets.nim
index cd84dca1a01ef..22b3221fc5b81 100644
--- a/lib/pure/collections/intsets.nim
+++ b/lib/pure/collections/intsets.nim
@@ -6,7 +6,7 @@
 #    distribution, for details about the copyright.
 #
 
-## Deprecated by the generic `IntSet` for ordinal sparse sets.
+## Deprecated by the generic `OrdSet[A: Ordinal]` for ordinal sparse sets.
 ## **See also:**
 ## * `ordinal sets module <ordsets.html>`_ for more general int sets
 
@@ -22,6 +22,7 @@ proc initIntSet*(): IntSet = initOrdSet[int]()
 
 iterator items*(s: IntSet): int {.inline, deprecated: "use ordsets".} =
   for i in ordsets.items(s): yield i
+
 # purely delegating
 proc contains*(s: IntSet, key: int): bool {.deprecated: "use ordsets".} = ordsets.contains(s, key)
 proc incl*(s: var IntSet, key: int) {.deprecated: "use ordsets".} = ordsets.incl(s, key)
diff --git a/lib/pure/collections/ordsets.nim b/lib/pure/collections/ordsets.nim
index 963e7ba938a01..ca13abc04f217 100644
--- a/lib/pure/collections/ordsets.nim
+++ b/lib/pure/collections/ordsets.nim
@@ -60,6 +60,8 @@ type
     head: PTrunk
     data: TrunkSeq
     a: array[0..33, int] # profiling shows that 34 elements are enough
+  
+  IntSet* = OrdSet[int]
 
 proc mustRehash[T](t: T): bool {.inline.} =
   let length = t.max + 1
diff --git a/lib/pure/collections/sets.nim b/lib/pure/collections/sets.nim
index 98dedc5ff6538..ea4ae8dd6231d 100644
--- a/lib/pure/collections/sets.nim
+++ b/lib/pure/collections/sets.nim
@@ -43,7 +43,7 @@
 ## that ``=`` performs a copy of the set.
 ##
 ## **See also:**
-## * `intsets module <intsets.html>`_ for efficient int sets
+## * `ordsets module <ordsets.html>`_ for efficient int and other ordinal sets
 ## * `tables module <tables.html>`_ for hash tables
 
 
diff --git a/lib/pure/marshal.nim b/lib/pure/marshal.nim
index e74e68b05b1bf..4ca5db4f04197 100644
--- a/lib/pure/marshal.nim
+++ b/lib/pure/marshal.nim
@@ -61,7 +61,7 @@ Please use alternative packages for serialization.
 It is possible to reimplement this module using generics and type traits.
 Please contribute a new implementation.""".}
 
-import streams, typeinfo, json, intsets, tables, unicode
+import streams, typeinfo, json, ordsets, tables, unicode
 
 proc ptrToInt(x: pointer): int {.inline.} =
   result = cast[int](x) # don't skip alignment
@@ -298,7 +298,7 @@ proc store*[T](s: Stream, data: T) =
     s.setPosition(0)
     assert s.readAll() == "[1, 3, 5]"
 
-  var stored = initIntSet()
+  var stored = initOrdSet[int]()
   var d: T
   shallowCopy(d, data)
   storeAny(s, toAny(d), stored)
@@ -317,7 +317,7 @@ proc `$$`*[T](x: T): string =
     let y = $$x
     assert y == """{"id": 1, "bar": "baz"}"""
 
-  var stored = initIntSet()
+  var stored = initOrdSet[int]()
   var d: T
   shallowCopy(d, x)
   var s = newStringStream()
diff --git a/testament/testament.nim b/testament/testament.nim
index 4afafb645e61b..77f9c28f37ad8 100644
--- a/testament/testament.nim
+++ b/testament/testament.nim
@@ -12,7 +12,7 @@
 import
   strutils, pegs, os, osproc, streams, json,
   backend, parseopt, specs, htmlgen, browsers, terminal,
-  algorithm, times, md5, sequtils, azure, intsets
+  algorithm, times, md5, sequtils, azure, ordsets
 from std/sugar import dup
 import compiler/nodejs
 
@@ -320,7 +320,7 @@ proc addResult(r: var TResults, test: TTest, target: TTarget,
 
 proc checkForInlineErrors(r: var TResults, expected, given: TSpec, test: TTest, target: TTarget) =
   let pegLine = peg"{[^(]*} '(' {\d+} ', ' {\d+} ') ' {[^:]*} ':' \s* {.*}"
-  var covered = initIntSet()
+  var covered = initOrdSet[int]()
   for line in splitLines(given.nimout):
 
     if line =~ pegLine:
diff --git a/tests/gc/weakrefs.nim b/tests/gc/weakrefs.nim
index 81c048d746d14..50cba12243c3a 100644
--- a/tests/gc/weakrefs.nim
+++ b/tests/gc/weakrefs.nim
@@ -2,7 +2,7 @@ discard """
   output: "true"
 """
 
-import intsets
+import ordsets
 
 type
   TMyObject = object
@@ -14,7 +14,7 @@ type
 
 var
   gid: int # for id generation
-  valid = initIntSet()
+  valid = initOrdSet[int]()
 
 proc finalizer(x: StrongObject) =
   valid.excl(x.id)
diff --git a/tests/js/tstdlib_imports.nim b/tests/js/tstdlib_imports.nim
index 7611b7dcb9993..dc8f53ad5f688 100644
--- a/tests/js/tstdlib_imports.nim
+++ b/tests/js/tstdlib_imports.nim
@@ -14,7 +14,7 @@ import std/[
   algorithm, sequtils,
   
   # Collections:
-  critbits, deques, heapqueue, intsets, lists, options, sets,
+  critbits, deques, heapqueue, ordsets, lists, options, sets,
   sharedlist, tables,
   # fails: sharedtables
 
diff --git a/tests/system/tuse_version.nim b/tests/system/tuse_version.nim
index 36dac46eca0f3..f9caa10847681 100644
--- a/tests/system/tuse_version.nim
+++ b/tests/system/tuse_version.nim
@@ -13,7 +13,7 @@ import std/[
   algorithm, sequtils,
 
   # Collections:
-  critbits, deques, heapqueue, intsets, lists, options, sets,
+  critbits, deques, heapqueue, ordsets, lists, options, sets,
   sharedlist, tables,
 
   # Strings:
diff --git a/tests/test_nimscript.nims b/tests/test_nimscript.nims
index d9f47736681f8..a7ca74a1885d3 100644
--- a/tests/test_nimscript.nims
+++ b/tests/test_nimscript.nims
@@ -13,7 +13,7 @@ import std/[
   algorithm, sequtils,
 
   # Collections:
-  critbits, deques, heapqueue, intsets, lists, options, sets,
+  critbits, deques, heapqueue, ordsets, lists, options, sets,
   sharedlist, tables,
   # fails: sharedtables
 
diff --git a/tools/heapdumprepl.nim b/tools/heapdumprepl.nim
index dbaef2f2cd3ce..595f54116bf4c 100644
--- a/tools/heapdumprepl.nim
+++ b/tools/heapdumprepl.nim
@@ -1,6 +1,6 @@
 
 include prelude
-import intsets
+import ordsets
 
 type
   NodeKind = enum
@@ -36,7 +36,7 @@ proc parseHex(s: string): int =
   discard parseutils.parseHex(s, result, 0)
 
 proc reachable(g: Graph; stack: var seq[int]; goal: int): bool =
-  var t = initIntSet()
+  var t = initOrdSet[int]()
   while stack.len > 0:
     let it = stack.pop
     if not t.containsOrIncl(it):