diff --git a/docs/quickstart.mld b/docs/quickstart.mld
index ec9d0a38..42a59ae4 100644
--- a/docs/quickstart.mld
+++ b/docs/quickstart.mld
@@ -151,7 +151,7 @@ Reporter.emit ~loc:real_loc "wow" (* using [real_loc] instead  *)
 
 If you have seen an exception from asai like this:
 {v
-Invalid_argument("Asai.Explicator.explicate: <REASON>; use the debug mode")
+Invalid_argument("Asai.SourceMarker.mark: <REASON>; use the debug mode")
 v}
 It means asai has detected invalid ranges. This usually indicates that your lexer or parser is buggy and generates invalid locations. For efficiency, asai by default will not check ranges carefully, but you can force it to do so by using the optional argument [debug]:
 {[
diff --git a/src/Asai.ml b/src/Asai.ml
index 20567fbc..7b2888a8 100644
--- a/src/Asai.ml
+++ b/src/Asai.ml
@@ -9,9 +9,9 @@ module MinimumSigs = MinimumSigs
 module Tty = Tty
 module GitHub = GitHub
 
-module Explication = Explication
-module Explicator = Explicator
+module MarkedSource = MarkedSource
+module SourceMarker = SourceMarker
 module SourceReader = SourceReader
 
-module UserContent = UserContent
-module Flattener = Flattener
+module SourceUtils = SourceUtils
+module RangeFlattener = RangeFlattener
diff --git a/src/Asai.mli b/src/Asai.mli
index 418ff03c..96996ab9 100644
--- a/src/Asai.mli
+++ b/src/Asai.mli
@@ -50,10 +50,10 @@ module GitHub = GitHub
 (** The internals are exposed for convenience, but they are subject to changes between minor versions. *)
 
 (** The definition of highlighted text suitable for rendering. You probably do not need this module unless you want to create your own diagnostic handler. *)
-module Explication = Explication
+module MarkedSource = MarkedSource
 
 (** Turning location information into highlighted text suitable for rendering. You probably do not need this module unless you want to create your own diagnostic handler. *)
-module Explicator = Explicator
+module SourceMarker = SourceMarker
 
 (** Reading the source content. It uses memory-mapped I/O for files. You probably do not need this module unless you want to create your own diagnostic handler. *)
 module SourceReader = SourceReader
@@ -61,7 +61,7 @@ module SourceReader = SourceReader
 (**/**)
 
 (** Helper functions for handling user content. This is exposed for internal testing. Absolutely no stability guarantees. *)
-module UserContent = UserContent
+module SourceUtils = SourceUtils
 
-(** The internal flattener that is tightly coupled with {!module:Explication}. This is exposed for internal testing. Absolutely no stability guarantees. *)
-module Flattener = Flattener
+(** The internal flattener that is tightly coupled with {!module:MarkedSource}. This is exposed for internal testing. Absolutely no stability guarantees. *)
+module RangeFlattener = RangeFlattener
diff --git a/src/Explicator.mli b/src/Explicator.mli
deleted file mode 100644
index aa101ebd..00000000
--- a/src/Explicator.mli
+++ /dev/null
@@ -1,4 +0,0 @@
-include module type of ExplicatorSigs
-
-(** Making an explicator. *)
-module Make : functor (Tag : Tag) -> S with module Tag := Tag
diff --git a/src/Explication.ml b/src/MarkedSource.ml
similarity index 97%
rename from src/Explication.ml
rename to src/MarkedSource.ml
index f3add5bd..d52d4fa3 100644
--- a/src/Explication.ml
+++ b/src/MarkedSource.ml
@@ -1,4 +1,4 @@
-include ExplicationData
+include MarkedSourceData
 
 let dump_marker dump_tag fmt =
   function
diff --git a/src/Explication.mli b/src/MarkedSource.mli
similarity index 88%
rename from src/Explication.mli
rename to src/MarkedSource.mli
index 0b2193ed..9ed63a65 100644
--- a/src/Explication.mli
+++ b/src/MarkedSource.mli
@@ -1,7 +1,7 @@
 (** {1 Types} *)
 
 (* @include *)
-include module type of ExplicationData
+include module type of MarkedSourceData
 
 (** {1 Debugging} *)
 
diff --git a/src/ExplicationData.ml b/src/MarkedSourceData.ml
similarity index 100%
rename from src/ExplicationData.ml
rename to src/MarkedSourceData.ml
diff --git a/src/Flattener.ml b/src/RangeFlattener.ml
similarity index 99%
rename from src/Flattener.ml
rename to src/RangeFlattener.ml
index 2a9279b9..bae1923a 100644
--- a/src/Flattener.ml
+++ b/src/RangeFlattener.ml
@@ -1,8 +1,8 @@
 open Bwd
 open Bwd.Infix
 
-open Explication
-open ExplicatorSigs
+open MarkedSource
+open SourceMarkerSigs
 
 type 'tag block =
   { begin_line_num : int
diff --git a/src/Flattener.mli b/src/RangeFlattener.mli
similarity index 88%
rename from src/Flattener.mli
rename to src/RangeFlattener.mli
index 21caba6b..6eb71bc5 100644
--- a/src/Flattener.mli
+++ b/src/RangeFlattener.mli
@@ -1,4 +1,4 @@
-open Explication
+open MarkedSource
 
 type 'tag block =
   { begin_line_num : int
@@ -12,6 +12,6 @@ type 'tag t = (Range.source * 'tag block list) list
 val dump_block : (Format.formatter -> 'tag -> unit) -> Format.formatter -> 'tag block -> unit
 val dump : (Format.formatter -> 'tag -> unit) -> Format.formatter -> 'tag t -> unit
 
-module Make (Tag : ExplicatorSigs.Tag) : sig
+module Make (Tag : SourceMarkerSigs.Tag) : sig
   val flatten : block_splitting_threshold:int -> (Range.t * Tag.t) list -> Tag.t t
 end
diff --git a/src/Explicator.ml b/src/SourceMarker.ml
similarity index 75%
rename from src/Explicator.ml
rename to src/SourceMarker.ml
index dc4249c7..7ea8254f 100644
--- a/src/Explicator.ml
+++ b/src/SourceMarker.ml
@@ -1,12 +1,12 @@
 open Bwd
 open Bwd.Infix
 
-open Explication
-include ExplicatorSigs
+open MarkedSource
+include SourceMarkerSigs
 
 (* helper functions used by the register_printer below *)
 
-let print_invalid_offset fmt : UserContent.invalid_offset -> unit =
+let print_invalid_offset fmt : SourceUtils.invalid_offset -> unit =
   function
   | `Negative i ->
     Format.fprintf fmt "its@ offset@ %d@ is@ negative." i
@@ -15,7 +15,7 @@ let print_invalid_offset fmt : UserContent.invalid_offset -> unit =
   | `Within_newline (i, (s, e)) ->
     Format.fprintf fmt "its@ offset@ %d@ is@ within@ a@ newline@ sequence@ [%d,%d)." i s e
 
-let print_invalid_position fmt : UserContent.invalid_position -> unit =
+let print_invalid_position fmt : SourceUtils.invalid_position -> unit =
   function
   | `Offset r ->
     print_invalid_offset fmt r
@@ -24,7 +24,7 @@ let print_invalid_position fmt : UserContent.invalid_position -> unit =
   | `Incorrect_line_num (ln, ln') ->
     Format.fprintf fmt "its@ line@ number@ is@ %d@ but@ it@ should@ have@ been@ %d." ln ln'
 
-let print_invalid_range fmt : UserContent.invalid_range -> unit =
+let print_invalid_range fmt : SourceUtils.invalid_range -> unit =
   function
   | `Begin r ->
     Format.fprintf fmt "its@ beginning@ position@ is@ invalid;@ %a" print_invalid_position r
@@ -59,7 +59,7 @@ module Make (Tag : Tag) = struct
     String.init (end_ - begin_) @@ fun i ->
     SourceReader.unsafe_get source (begin_ + i)
 
-  type explicator_state =
+  type marker_state =
     { lines : Tag.t line bwd
     ; tokens : Tag.t token bwd
     ; remaining_line_markers : (int * Tag.t) list
@@ -69,20 +69,20 @@ module Make (Tag : Tag) = struct
     ; line_num : int
     }
 
-  module F = Flattener.Make(Tag)
+  module F = RangeFlattener.Make(Tag)
 
-  let explicate_block ~line_breaks source (b : Tag.t Flattener.block) : Tag.t block =
+  let mark_block ~line_breaks source (b : Tag.t RangeFlattener.block) : Tag.t block =
     match b.markers with
-    | [] -> invalid_arg "explicate_block: empty block; should be impossible"
+    | [] -> invalid_arg "mark_block: empty block; should be impossible"
     | ((first_loc, _) :: _) as markers ->
       let source = SourceReader.load source in
       let eof = SourceReader.length source in
-      let find_eol i = UserContent.find_eol ~line_breaks (SourceReader.unsafe_get source) (i, eof) in
+      let find_eol i = SourceUtils.find_eol ~line_breaks (SourceReader.unsafe_get source) (i, eof) in
       let rec go state : (Range.position * Tag.t marker) list -> _ =
         function
         | (loc, marker) :: markers when state.cursor.line_num = loc.line_num (* on the same line *) ->
-          if loc.offset > eof then invalid_arg "Asai.Explicator.explicate: position beyond EOF; use the debug mode";
-          if loc.offset > state.eol then invalid_arg "Asai.Explicator.explicate: unexpected newline; use the debug mode";
+          if loc.offset > eof then invalid_arg "Asai.SourceMarker.mark: position beyond EOF; use the debug mode";
+          if loc.offset > state.eol then invalid_arg "Asai.SourceMarker.mark: unexpected newline; use the debug mode";
           let tokens =
             if loc.offset = state.cursor.offset then
               state.tokens <: Marker marker
@@ -113,11 +113,11 @@ module Make (Tag : Tag) = struct
           | [], _ ->
             assert (state.line_num = b.end_line_num);
             lines
-          | _ :: _, None -> invalid_arg "Asai.Explicator.explicate: position beyond EOF; use the debug mode"
+          | _ :: _, None -> invalid_arg "Asai.SourceMarker.mark: position beyond EOF; use the debug mode"
           | (loc, _) :: _, Some eol_shift ->
-            if loc.offset > eof then invalid_arg "Asai.Explicator.explicate: position beyond EOF; use the debug mode";
-            if loc.offset <= state.eol then invalid_arg "Asai.Explicator.explicate: expected newline missing; use the debug mode";
-            if loc.offset < state.eol + eol_shift then invalid_arg "Asai.Explicator.explicate: offset within newline; use the debug mode";
+            if loc.offset > eof then invalid_arg "Asai.SourceMarker.mark: position beyond EOF; use the debug mode";
+            if loc.offset <= state.eol then invalid_arg "Asai.SourceMarker.mark: expected newline missing; use the debug mode";
+            if loc.offset < state.eol + eol_shift then invalid_arg "Asai.SourceMarker.mark: offset within newline; use the debug mode";
             (* Okay, p is really on the next line *)
             let cursor = eol_to_next_line eol_shift {state.cursor with offset = state.eol} in
             let eol, eol_shift = find_eol (state.eol + eol_shift) in
@@ -151,11 +151,11 @@ module Make (Tag : Tag) = struct
       ; lines = Bwd.to_list @@ lines
       }
 
-  let[@inline] explicate_blocks ~line_breaks source ranges =
-    List.map (explicate_block ~line_breaks source) ranges
+  let[@inline] mark_blocks ~line_breaks source ranges =
+    List.map (mark_block ~line_breaks source) ranges
 
-  let[@inline] explicate_part ~line_breaks (source, bs) : Tag.t part =
-    { source; blocks = explicate_blocks ~line_breaks source bs }
+  let[@inline] mark_part ~line_breaks (source, bs) : Tag.t part =
+    { source; blocks = mark_blocks ~line_breaks source bs }
 
   let check_ranges ~line_breaks ranges =
     List.iter
@@ -163,11 +163,11 @@ module Make (Tag : Tag) = struct
          let source = SourceReader.load @@ Range.source range in
          let read = SourceReader.unsafe_get source in
          let eof = SourceReader.length source in
-         try UserContent.check_range ~line_breaks ~eof read range
-         with UserContent.Invalid_range reason -> raise @@ Invalid_range (range, reason))
+         try SourceUtils.check_range ~line_breaks ~eof read range
+         with SourceUtils.Invalid_range reason -> raise @@ Invalid_range (range, reason))
       ranges
 
-  let explicate ?(line_breaks=`Traditional) ?(block_splitting_threshold=5) ?(debug=false) ranges =
+  let mark ?(line_breaks=`Traditional) ?(block_splitting_threshold=5) ?(debug=false) ranges =
     if debug then check_ranges ~line_breaks ranges;
-    List.map (explicate_part ~line_breaks) @@ F.flatten ~block_splitting_threshold ranges
+    List.map (mark_part ~line_breaks) @@ F.flatten ~block_splitting_threshold ranges
 end
diff --git a/src/SourceMarker.mli b/src/SourceMarker.mli
new file mode 100644
index 00000000..a0d8053b
--- /dev/null
+++ b/src/SourceMarker.mli
@@ -0,0 +1,4 @@
+include module type of SourceMarkerSigs
+
+(** Making a marker. *)
+module Make : functor (Tag : Tag) -> S with module Tag := Tag
diff --git a/src/ExplicatorSigs.ml b/src/SourceMarkerSigs.ml
similarity index 79%
rename from src/ExplicatorSigs.ml
rename to src/SourceMarkerSigs.ml
index f005b43b..ed1ef8c8 100644
--- a/src/ExplicatorSigs.ml
+++ b/src/SourceMarkerSigs.ml
@@ -1,7 +1,7 @@
-open Explication
+open MarkedSource
 
-exception Invalid_range of Range.t * UserContent.invalid_range
-(** [Invalid_range (range, reason)] means that [range] is an invalid range because of [reason]. This exception will be raised only when the debug mode is enabled. See the [debug] parameter of {!val:Explicator.S.explicate} for enabling the debug mode. *)
+exception Invalid_range of Range.t * SourceUtils.invalid_range
+(** [Invalid_range (range, reason)] means that [range] is an invalid range because of [reason]. This exception will be raised only when the debug mode is enabled. See the [debug] parameter of {!val:SourceMarker.S.mark} for enabling the debug mode. *)
 
 (** The signature of tags *)
 module type Tag = sig
@@ -17,12 +17,12 @@ module type Tag = sig
   val dump : Format.formatter -> t -> unit
 end
 
-(** The signature of explicators. *)
+(** The signature of markers. *)
 module type S = sig
   module Tag : Tag
 
-  val explicate : ?line_breaks:[`Unicode | `Traditional] -> ?block_splitting_threshold:int -> ?debug:bool -> (Range.t * Tag.t) list -> Tag.t t
-  (** Explicate a list of ranges using content from a data reader. This function must be run under [SourceReader.run].
+  val mark : ?line_breaks:[`Unicode | `Traditional] -> ?block_splitting_threshold:int -> ?debug:bool -> (Range.t * Tag.t) list -> Tag.t t
+  (** Mark content from a source reader with a list of ranges. This function must be run within [SourceReader.run].
 
       @param line_breaks The set of character sequences that are recognized as (hard) line breaks. The [`Unicode] set contains all Unicode character sequences in {{:https://www.unicode.org/versions/Unicode15.0.0/ch05.pdf#G41643}Unicode 15.0.0 Table 5-1.} The [`Traditional] set only contains [U+000A (LF)], [U+000D (CR)], and [U+000D U+000A (CRLF)] as line breaks. The default is the [`Traditional] set.
       @param block_splitting_threshold The maximum number of consecutive, non-highlighted lines allowed in a block. The function will try to minimize the number of blocks, as long as no block has too many consecutive, non-highlighted lines. A higher threshold will lead to fewer blocks. When the threshold is zero, it means no block can contain any non-highlighted line. The default value is zero.
diff --git a/src/UserContent.ml b/src/SourceUtils.ml
similarity index 98%
rename from src/UserContent.ml
rename to src/SourceUtils.ml
index c7a952db..de389382 100644
--- a/src/UserContent.ml
+++ b/src/SourceUtils.ml
@@ -1,8 +1,7 @@
-include UserContentData
+include SourceUtilsData
 
 exception Invalid_offset of invalid_offset
 exception Invalid_position of invalid_position
-exception Invalid_range of invalid_range
 
 let find_eol_traditional read (i, eof) =
   let rec go i =
diff --git a/src/UserContent.mli b/src/SourceUtils.mli
similarity index 92%
rename from src/UserContent.mli
rename to src/SourceUtils.mli
index 7f1ff0f3..95dbf759 100644
--- a/src/UserContent.mli
+++ b/src/SourceUtils.mli
@@ -1,7 +1,4 @@
-include module type of UserContentData
-
-(** The exception indicating that a range is invalid. *)
-exception Invalid_range of invalid_range
+include module type of SourceUtilsData
 
 (** [find_eol ~line_breaks read (pos, eof)] returns the end position of the first line and the length of the first newline sequence (if any) within the range [\[pos, end)]. If no newlines are found, then [None] is returned as the length.
 
diff --git a/src/UserContentData.ml b/src/SourceUtilsData.ml
similarity index 91%
rename from src/UserContentData.ml
rename to src/SourceUtilsData.ml
index 394d59af..cfd7f594 100644
--- a/src/UserContentData.ml
+++ b/src/SourceUtilsData.ml
@@ -17,3 +17,6 @@ type invalid_range =
   [ `Begin of invalid_position (** The first position of a range is invalid. *)
   | `End of invalid_position (** The second position of a range is invalid. *)
   ]
+
+(** The exception indicating that a range is invalid. *)
+exception Invalid_range of invalid_range
diff --git a/src/tty/Tty.ml b/src/tty/Tty.ml
index 2a345885..614e706d 100644
--- a/src/tty/Tty.ml
+++ b/src/tty/Tty.ml
@@ -8,7 +8,7 @@ let string_of_severity : Diagnostic.severity -> string =
   | Error -> "error"
   | Bug -> "bug"
 
-module E = Explicator.Make(TtyTag)
+module SM = SourceMarker.Make(TtyTag)
 
 (* calculating the width of line numbers *)
 
@@ -51,9 +51,9 @@ let render_code ~param ~severity fmt short_code =
     short_code
     (Ansi.reset_string ~param style)
 
-(* explication *)
+(* marked source *)
 
-module ExplicationRenderer :
+module MarkedSourceRenderer :
 sig
   type param =
     {
@@ -63,7 +63,7 @@ sig
       ansi : Ansi.param;
     }
 
-  val render : param:param -> Format.formatter -> TtyTag.t Explication.t -> unit
+  val render : param:param -> Format.formatter -> TtyTag.t MarkedSource.t -> unit
 end
 =
 struct
@@ -97,7 +97,7 @@ struct
     let style = TtyStyle.highlight ~param:param.ansi param.severity tag in
     Format.fprintf fmt (highlight "%s")
       (Ansi.style_string ~param:param.ansi style)
-      (UserContent.replace_control ~tab_size:param.tab_size segment)
+      (SourceUtils.replace_control ~tab_size:param.tab_size segment)
       (Ansi.reset_string ~param:param.ansi style)
 
   (* Current design:
@@ -106,16 +106,16 @@ struct
      ‹let x◂POS₀▸ = 1›₀ in let ‹x›₁ = «1 + ‹x›₂»◂POS₁▸
   *)
 
-  let render_line ~line_num ~param fmt init_tag_set Explication.{tokens; markers} =
+  let render_line ~line_num ~param fmt init_tag_set MarkedSource.{tokens; markers} =
     let go set =
       function
-      | Explication.String s ->
+      | MarkedSource.String s ->
         render_styled_segment ~param fmt (TtyTagSet.prioritized set) s; set
-      | Explication.Marker RangeEnd t ->
+      | MarkedSource.Marker RangeEnd t ->
         TtyTagSet.remove t set
-      | Explication.Marker Point t ->
+      | MarkedSource.Marker Point t ->
         render_styled_segment ~param fmt (Some t) "‹POS›"; set
-      | Explication.Marker RangeBegin t ->
+      | MarkedSource.Marker RangeBegin t ->
         TtyTagSet.add t set
     in
     Format.fprintf fmt (" " ^^ highlight "%*d |" ^^ " ")
@@ -135,10 +135,10 @@ struct
       (begin_line_num, TtyTagSet.empty)
       lines
 
-  let render_block ~param fmt Explication.{begin_line_num; end_line_num=_; lines} =
+  let render_block ~param fmt MarkedSource.{begin_line_num; end_line_num=_; lines} =
     render_lines ~param ~begin_line_num fmt lines
 
-  let render_part ~param fmt Explication.{source; blocks} =
+  let render_part ~param fmt MarkedSource.{source; blocks} =
     render_source_header fmt source;
     List.iter (render_block ~param fmt) blocks
 
@@ -178,15 +178,15 @@ struct
       ansi : Ansi.param;
     }
 
-  let line_number_width explication : int =
-    let max_line_number_block Explication.{end_line_num; _} = end_line_num in
-    let max_line_number_part Explication.{blocks; _} =
+  let line_number_width marked_source : int =
+    let max_line_number_block MarkedSource.{end_line_num; _} = end_line_num in
+    let max_line_number_part MarkedSource.{blocks; _} =
       Utils.maximum @@ List.map max_line_number_block blocks
     in
-    let max_line_number (parts : _ Explication.t) =
+    let max_line_number (parts : _ MarkedSource.t) =
       Utils.maximum @@ List.map max_line_number_part parts
     in
-    String.length @@ Int.to_string @@ max_line_number explication
+    String.length @@ Int.to_string @@ max_line_number marked_source
 
   let render_textloc ~param ~severity ~extra_remarks fmt (textloc : Loctext.t) =
     let located_tags, unlocated_tags =
@@ -198,12 +198,12 @@ struct
           | (tag, Range.{loc = Some r; value = text}) -> Either.Left (r, (tag, text)))
         (main :: extra_remarks)
     in
-    let explication =
-      E.explicate ~block_splitting_threshold:param.block_splitting_threshold ~debug:param.debug located_tags
+    let marked_source =
+      SM.mark ~block_splitting_threshold:param.block_splitting_threshold ~debug:param.debug located_tags
     in
-    let line_number_width = line_number_width explication in
-    let param = {ExplicationRenderer.severity = severity; tab_size = param.tab_size; line_number_width; ansi = param.ansi} in
-    ExplicationRenderer.render ~param fmt explication;
+    let line_number_width = line_number_width marked_source in
+    let param = {MarkedSourceRenderer.severity = severity; tab_size = param.tab_size; line_number_width; ansi = param.ansi} in
+    MarkedSourceRenderer.render ~param fmt marked_source;
     List.iter (render_unlocated_tag ~severity:param.severity ~ansi:param.ansi fmt) unlocated_tags
 
   let render_backtrace ~param ~severity fmt backtrace =
diff --git a/src/tty/Tty.mli b/src/tty/Tty.mli
index 893476bc..171be2da 100644
--- a/src/tty/Tty.mli
+++ b/src/tty/Tty.mli
@@ -30,8 +30,8 @@ module Make (Message : MinimumSigs.Message) : sig
       @param tab_size The number of spaces that should be used to replace a horizontal tab. Note that a horizontal tab is always expanded to the same number of spaces. The result should still be visually appealing as long as horizontal tabs are only used at the beginning of lines. The default value is [8].
       @param debug Whether to enable the debug mode that performs expensive extra checking. The default is [false].
 
-      @raise Invalid_argument if [use_color] is explicitly set to [true] but [use_ansi] is explicitly set to [false], or if [tab_size < 0], or if invalid ranges are detected. When the debug mode is enabled, detection of invalid ranges will raise the more structured exception {!exception:Explicator.Invalid_range} instead.
-      @raise Invalid_range if the debug mode is enabled and invalid ranges are detected. See {!exception:Explicator.Invalid_range} for the detailed listing of all possible errors being reported.
+      @raise Invalid_argument if [use_color] is explicitly set to [true] but [use_ansi] is explicitly set to [false], or if [tab_size < 0], or if invalid ranges are detected. When the debug mode is enabled, detection of invalid ranges will raise the more structured exception {!exception:SourceMarker.Invalid_range} instead.
+      @raise Invalid_range if the debug mode is enabled and invalid ranges are detected. See {!exception:SourceMarker.Invalid_range} for the detailed listing of all possible errors being reported.
 
       @see <https://no-color.org/> for the [NO_COLOR] specification
   *)
diff --git a/test/TestFlattener.ml b/test/TestRangeFlattener.ml
similarity index 89%
rename from test/TestFlattener.ml
rename to test/TestRangeFlattener.ml
index 0c994710..d72e64d9 100644
--- a/test/TestFlattener.ml
+++ b/test/TestRangeFlattener.ml
@@ -1,9 +1,8 @@
 open Asai
 
-module E = Explicator.Make(IntTag)
-module F = Flattener.Make(IntTag)
+module F = RangeFlattener.Make(IntTag)
 
-let test_flattened = Alcotest.of_pp (Flattener.dump IntTag.dump)
+let test_flattened = Alcotest.of_pp (RangeFlattener.dump IntTag.dump)
 
 let single_line_flatten () =
   let source = `String {Range.title = None; content = "aaabbbcccdddeee"} in
@@ -21,7 +20,7 @@ let single_line_flatten () =
     ; Range.make (pt2, pt4), (3, "4")
     ]
   in
-  let expected : _ Flattener.t =
+  let expected : _ RangeFlattener.t =
     [(source,
       [{begin_line_num=1;
         end_line_num=1;
@@ -38,7 +37,7 @@ let single_line_flatten () =
         line_markers=[(1, (2, "2")); (1, (1, "1")); (1, (1, "3")); (1, (3, "4"))]}])]
   in
   let actual = F.flatten ~block_splitting_threshold:5 ranges in
-  Alcotest.(check test_flattened) "Flattener is correct" expected actual
+  Alcotest.(check test_flattened) "RangeFlattener is correct" expected actual
 
 let multi_lines () =
   let source =
@@ -80,7 +79,7 @@ ggggghh
       Range.make (begin_of_line15, pt56), (16, "5");
     ]
   in
-  let expected : _ Flattener.t =
+  let expected : _ RangeFlattener.t =
     [(source,
       [{begin_line_num=2;
         end_line_num=9;
@@ -109,11 +108,11 @@ ggggghh
           [(15, (16, "5"))]}])]
   in
   let actual = F.flatten ~block_splitting_threshold:5 ranges in
-  Alcotest.(check test_flattened) "Flattener is correct" expected actual
+  Alcotest.(check test_flattened) "RangeFlattener is correct" expected actual
 
 let () =
   let open Alcotest in
-  Alcotest.run "Flattener" [
+  Alcotest.run "RangeFlattener" [
     "flattening",
     [
       test_case "single-line ranges" `Quick single_line_flatten;
diff --git a/test/TestExplicator.ml b/test/TestSourceMarker.ml
similarity index 89%
rename from test/TestExplicator.ml
rename to test/TestSourceMarker.ml
index 0cef4589..f1c6836b 100644
--- a/test/TestExplicator.ml
+++ b/test/TestSourceMarker.ml
@@ -1,15 +1,15 @@
 open Asai
 
-module E = Explicator.Make(IntTag)
+module SM = SourceMarker.Make(IntTag)
 
-let test_explication = Alcotest.of_pp (Explication.dump IntTag.dump)
+let test_marked_source = Alcotest.of_pp (MarkedSource.dump IntTag.dump)
 
 let single_line mode eol () =
   let source = `String {Range.title = None; content = "aaabbbcccdddeee" ^ eol} in
   let begin_of_line1 : Range.position = {source; offset = 0; start_of_line = 0; line_num = 1} in
   let range1 = Range.make ({begin_of_line1 with offset = 3}, {begin_of_line1 with offset = 9}), (1, "1") in
   let range2 = Range.make ({begin_of_line1 with offset = 6}, {begin_of_line1 with offset = 12}), (2, "2") in
-  let expected : _ Explication.t =
+  let expected : _ MarkedSource.t =
     [{source;
       blocks =
         [{begin_line_num = 1;
@@ -29,15 +29,15 @@ let single_line mode eol () =
                 ]}]}
         ]}
     ] in
-  let actual = E.explicate ~line_breaks:mode [range1; range2] in
-  Alcotest.(check test_explication) "Explication is correct" expected actual
+  let actual = SM.mark ~line_breaks:mode [range1; range2] in
+  Alcotest.(check test_marked_source) "MarkedSource is correct" expected actual
 
 let multi_lines_with_ls () =
   let source = `String {Range.title = None; content = "aabbbbb\u{2028}bbbbccc"} in
   let begin_of_line1 : Range.position = {source; offset = 0; start_of_line = 0; line_num = 1} in
   let begin_of_line2 : Range.position = {source; offset = 10; start_of_line = 10; line_num = 2} in
   let range = Range.make ({begin_of_line1 with offset = 2}, {begin_of_line2 with offset = 14}), (1, "1") in
-  let expected : _ Explication.t =
+  let expected : _ MarkedSource.t =
     [{source;
       blocks =
         [{begin_line_num = 1;
@@ -58,8 +58,8 @@ let multi_lines_with_ls () =
         ]}
     ]
   in
-  let actual = E.explicate ~line_breaks:`Unicode [range] in
-  Alcotest.(check test_explication) "Explication is correct" expected actual
+  let actual = SM.mark ~line_breaks:`Unicode [range] in
+  Alcotest.(check test_marked_source) "MarkedSource is correct" expected actual
 
 let multi_lines () =
   let source =
@@ -96,7 +96,7 @@ ggggghh
       Range.make (begin_of_line15, {begin_of_line15 with offset = 51+5}), (16, "5");
     ]
   in
-  let expected : _ Explication.t =
+  let expected : _ MarkedSource.t =
     [{source;
       blocks=
         [{begin_line_num=2;
@@ -149,12 +149,12 @@ ggggghh
                  Marker (RangeEnd (16, "5"));
                  String "hh"]}]}]}]
   in
-  let actual = E.explicate ~line_breaks:`Traditional ~block_splitting_threshold:5 ranges in
-  Alcotest.(check test_explication) "Explication is correct" expected actual
+  let actual = SM.mark ~line_breaks:`Traditional ~block_splitting_threshold:5 ranges in
+  Alcotest.(check test_marked_source) "MarkedSource is correct" expected actual
 
 let () =
   let open Alcotest in
-  Alcotest.run "Explicator" [
+  Alcotest.run "SourceMarker" [
     "single-line",
     [
       test_case "traditional, empty" `Quick (single_line `Traditional "");
diff --git a/test/TestUserContent.ml b/test/TestSourceUtils.ml
similarity index 86%
rename from test/TestUserContent.ml
rename to test/TestSourceUtils.ml
index 12d8c20e..04852d8d 100644
--- a/test/TestUserContent.ml
+++ b/test/TestSourceUtils.ml
@@ -1,10 +1,10 @@
 let of_test name ~tab_size input expected =
   Alcotest.test_case name `Quick @@ fun () ->
   Alcotest.(check string) "Output matched" expected @@
-  Asai.UserContent.replace_control ~tab_size input
+  Asai.SourceUtils.replace_control ~tab_size input
 
 let () =
-  Alcotest.run "UserContent" [
+  Alcotest.run "SourceUtils" [
     "replace_control",
     [
       of_test "tab" ~tab_size:2 "123\t4\t" "123  4  ";
diff --git a/test/dune b/test/dune
index 16dd101e..0a3e1f30 100644
--- a/test/dune
+++ b/test/dune
@@ -1,11 +1,11 @@
 (tests
- (names TestExplicator TestFlattener)
- (modules TestExplicator TestFlattener IntTag)
+ (names TestSourceMarker TestRangeFlattener)
+ (modules TestSourceMarker TestRangeFlattener IntTag)
  (libraries asai alcotest))
 
 (tests
- (names TestUserContent TestText)
- (modules TestUserContent TestText)
+ (names TestSourceUtils TestText)
+ (modules TestSourceUtils TestText)
  (libraries asai alcotest))
 
 (test