diff --git a/test/scip/testdata/args.snapshot.rb b/test/scip/testdata/args.snapshot.rb
index e722770adc..5a33b7c570 100644
--- a/test/scip/testdata/args.snapshot.rb
+++ b/test/scip/testdata/args.snapshot.rb
@@ -1,7 +1,7 @@
  # typed: true
  
  def args(x, y)
-#^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#args().
+#^^^^^^^^^^^^^^ definition [..] Object#args().
 #         ^ definition local 1~#2634721084
 #            ^ definition local 2~#2634721084
    z = x + y
@@ -25,7 +25,7 @@ def args(x, y)
  end
  
  def keyword_args(w:, x: 3, y: [], **kwargs)
-#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#keyword_args().
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition [..] Object#keyword_args().
 #                 ^^ definition local 1~#3526982640
 #                     ^^ definition local 2~#3526982640
 #                           ^^ definition local 3~#3526982640
@@ -39,14 +39,14 @@ def keyword_args(w:, x: 3, y: [], **kwargs)
  end
  
  def use_kwargs
-#^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#use_kwargs().
+#^^^^^^^^^^^^^^ definition [..] Object#use_kwargs().
    h = { a: 3 }
 #  ^ definition local 1~#571973038
    keyword_args(w: 0, **h)
-#  ^^^^^^^^^^^^ reference scip-ruby gem TODO TODO Object#keyword_args().
+#  ^^^^^^^^^^^^ reference [..] Object#keyword_args().
 #                       ^ reference local 1~#571973038
    keyword_args(w: 0, x: 1, y: [2], **h)
-#  ^^^^^^^^^^^^ reference scip-ruby gem TODO TODO Object#keyword_args().
+#  ^^^^^^^^^^^^ reference [..] Object#keyword_args().
 #                                     ^ reference local 1~#571973038
    return
  end
diff --git a/test/scip/testdata/arrays.snapshot.rb b/test/scip/testdata/arrays.snapshot.rb
index 4d121c1639..96ab5c7c43 100644
--- a/test/scip/testdata/arrays.snapshot.rb
+++ b/test/scip/testdata/arrays.snapshot.rb
@@ -1,7 +1,7 @@
  # typed: true
  
  def arrays(a, i)
-#^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#arrays().
+#^^^^^^^^^^^^^^^^ definition [..] Object#arrays().
 #           ^ definition local 1~#513334479
 #              ^ definition local 2~#513334479
    a[0] = 0
diff --git a/test/scip/testdata/classes.snapshot.rb b/test/scip/testdata/classes.snapshot.rb
index a2564cadad..94aa02e4f2 100644
--- a/test/scip/testdata/classes.snapshot.rb
+++ b/test/scip/testdata/classes.snapshot.rb
@@ -4,47 +4,47 @@
 #^ definition local 1~#119448696
  
  class C1
-#      ^^ definition scip-ruby gem TODO TODO C1#
+#      ^^ definition [..] C1#
    def f()
-#  ^^^^^^^ definition scip-ruby gem TODO TODO C1#f().
+#  ^^^^^^^ definition [..] C1#f().
      _a = C1.new
 #    ^^ definition local 1~#3809224601
-#         ^^ reference scip-ruby gem TODO TODO C1#
+#         ^^ reference [..] C1#
      _b = M2::C2.new
 #    ^^ definition local 3~#3809224601
-#         ^^ reference scip-ruby gem TODO TODO M2#
-#             ^^ reference scip-ruby gem TODO TODO M2#C2#
+#         ^^ reference [..] M2#
+#             ^^ reference [..] M2#C2#
      return
    end
  end
  
  module M2
-#       ^^ definition scip-ruby gem TODO TODO M2#
+#       ^^ definition [..] M2#
    class C2
-#        ^^ definition scip-ruby gem TODO TODO M2#C2#
+#        ^^ definition [..] M2#C2#
    end
  end
  
  class M3::C3
-#      ^^ reference scip-ruby gem TODO TODO M3#
-#          ^^ definition scip-ruby gem TODO TODO M3#C3#
+#      ^^ reference [..] M3#
+#          ^^ definition [..] M3#C3#
  end
  
  def local_class()
-#^^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#local_class().
+#^^^^^^^^^^^^^^^^^ definition [..] Object#local_class().
    localClass = Class.new
 #  ^^^^^^^^^^ definition local 1~#552113551
-#               ^^^^^ reference scip-ruby gem TODO TODO Class#
+#               ^^^^^ reference [..] Class#
    # Technically, this is not supported by Sorbet (https://srb.help/3001),
    # but make sure we don't crash or do something weird.
    def localClass.myMethod()
-#  ^^^^^^^^^^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#myMethod().
+#  ^^^^^^^^^^^^^^^^^^^^^^^^^ definition [..] Object#myMethod().
      ":)"
    end
    _c = localClass.new
 #  ^^ definition local 3~#552113551
 #       ^^^^^^^^^^ reference local 1~#552113551
-#                  ^^^ reference scip-ruby gem TODO TODO Class#new().
+#                  ^^^ reference [..] Class#new().
    # TODO: Missing occurrence for myMethod
    _m = localClass.myMethod
 #  ^^ definition local 4~#552113551
@@ -53,53 +53,53 @@ def localClass.myMethod()
  end
  
  module M4
-#       ^^ definition scip-ruby gem TODO TODO M4#
+#       ^^ definition [..] M4#
    K = 0
-#  ^ definition scip-ruby gem TODO TODO M4#K.
-#  ^^^^^ reference scip-ruby gem TODO TODO M4#K.
+#  ^ definition [..] M4#K.
+#  ^^^^^ reference [..] M4#K.
  end
  
  def module_access()
-#^^^^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#module_access().
+#^^^^^^^^^^^^^^^^^^^ definition [..] Object#module_access().
    _ = M4::K
 #  ^ definition local 1~#3353511840
-#      ^^ reference scip-ruby gem TODO TODO M4#
-#          ^ reference scip-ruby gem TODO TODO M4#K.
+#      ^^ reference [..] M4#
+#          ^ reference [..] M4#K.
    return
  end
  
  module M5
-#       ^^ definition scip-ruby gem TODO TODO M5#
+#       ^^ definition [..] M5#
    module M6
-#         ^^ definition scip-ruby gem TODO TODO M5#M6#
+#         ^^ definition [..] M5#M6#
      def self.g()
-#    ^^^^^^^^^^^^ definition scip-ruby gem TODO TODO M5#<Class:M6>#g().
+#    ^^^^^^^^^^^^ definition [..] M5#<Class:M6>#g().
      end
    end
  
    def self.h()
-#  ^^^^^^^^^^^^ definition scip-ruby gem TODO TODO <Class:M5>#h().
+#  ^^^^^^^^^^^^ definition [..] <Class:M5>#h().
      M6.g()
-#    ^^ reference scip-ruby gem TODO TODO M5#M6#
-#       ^ reference scip-ruby gem TODO TODO M5#<Class:M6>#g().
+#    ^^ reference [..] M5#M6#
+#       ^ reference [..] M5#<Class:M6>#g().
      return
    end
  end
  
  class C7
-#      ^^ definition scip-ruby gem TODO TODO C7#
+#      ^^ definition [..] C7#
    module M8
-#         ^^ definition scip-ruby gem TODO TODO C7#M8#
+#         ^^ definition [..] C7#M8#
      def self.i()
-#    ^^^^^^^^^^^^ definition scip-ruby gem TODO TODO C7#<Class:M8>#i().
+#    ^^^^^^^^^^^^ definition [..] C7#<Class:M8>#i().
      end
    end
  
    def j()
-#  ^^^^^^^ definition scip-ruby gem TODO TODO C7#j().
+#  ^^^^^^^ definition [..] C7#j().
      M8.i()
-#    ^^ reference scip-ruby gem TODO TODO C7#M8#
-#       ^ reference scip-ruby gem TODO TODO C7#<Class:M8>#i().
+#    ^^ reference [..] C7#M8#
+#       ^ reference [..] C7#<Class:M8>#i().
      return
    end
  end
diff --git a/test/scip/testdata/fields_and_attrs.snapshot.rb b/test/scip/testdata/fields_and_attrs.snapshot.rb
index 6362c4817e..8ac31bb9fc 100644
--- a/test/scip/testdata/fields_and_attrs.snapshot.rb
+++ b/test/scip/testdata/fields_and_attrs.snapshot.rb
@@ -4,54 +4,54 @@
  # and how they interact with inheritance: https://stackoverflow.com/a/15773671/2682729
  
  class K
-#      ^ definition scip-ruby gem TODO TODO K#
+#      ^ definition [..] K#
    def m1
-#  ^^^^^^ definition scip-ruby gem TODO TODO K#m1().
+#  ^^^^^^ definition [..] K#m1().
      @f = 0
-#    ^^ definition scip-ruby gem TODO TODO K#@f.
+#    ^^ definition [..] K#@f.
      @g = @f
-#    ^^ definition scip-ruby gem TODO TODO K#@g.
-#         ^^ reference scip-ruby gem TODO TODO K#@f.
+#    ^^ definition [..] K#@g.
+#         ^^ reference [..] K#@f.
      return
    end
    def m2
-#  ^^^^^^ definition scip-ruby gem TODO TODO K#m2().
+#  ^^^^^^ definition [..] K#m2().
      @f = @g
-#    ^^ definition scip-ruby gem TODO TODO K#@f.
-#         ^^ reference scip-ruby gem TODO TODO K#@g.
+#    ^^ definition [..] K#@f.
+#         ^^ reference [..] K#@g.
      return
    end
  end
  
  # Extended
  class K
-#      ^ definition scip-ruby gem TODO TODO K#
+#      ^ definition [..] K#
    def m3
-#  ^^^^^^ definition scip-ruby gem TODO TODO K#m3().
+#  ^^^^^^ definition [..] K#m3().
      @g = @f
-#    ^^ definition scip-ruby gem TODO TODO K#@g.
-#         ^^ reference scip-ruby gem TODO TODO K#@f.
+#    ^^ definition [..] K#@g.
+#         ^^ reference [..] K#@f.
      return
    end
  end
  
  # Class instance var
  class L
-#      ^ definition scip-ruby gem TODO TODO L#
+#      ^ definition [..] L#
    @x = 10
-#  ^^ definition scip-ruby gem TODO TODO <Class:L>#@x.
+#  ^^ definition [..] <Class:L>#@x.
    @y = 9
-#  ^^ definition scip-ruby gem TODO TODO <Class:L>#@y.
+#  ^^ definition [..] <Class:L>#@y.
    def self.m1
-#  ^^^^^^^^^^^ definition scip-ruby gem TODO TODO <Class:L>#m1().
+#  ^^^^^^^^^^^ definition [..] <Class:L>#m1().
      @y = @x
-#    ^^ definition scip-ruby gem TODO TODO <Class:L>#@y.
-#         ^^ reference scip-ruby gem TODO TODO <Class:L>#@x.
+#    ^^ definition [..] <Class:L>#@y.
+#         ^^ reference [..] <Class:L>#@x.
      return
    end
  
    def m2
-#  ^^^^^^ definition scip-ruby gem TODO TODO L#m2().
+#  ^^^^^^ definition [..] L#m2().
      # FIXME: Missing references
      self.class.y = self.class.x
      return
@@ -60,29 +60,29 @@ def m2
  
  # Class var
  class N
-#      ^ definition scip-ruby gem TODO TODO N#
+#      ^ definition [..] N#
    @@a = 0
-#  ^^^ definition scip-ruby gem TODO TODO <Class:N>#@@a.
+#  ^^^ definition [..] <Class:N>#@@a.
    @@b = 1
-#  ^^^ definition scip-ruby gem TODO TODO <Class:N>#@@b.
+#  ^^^ definition [..] <Class:N>#@@b.
    def self.m1
-#  ^^^^^^^^^^^ definition scip-ruby gem TODO TODO <Class:N>#m1().
+#  ^^^^^^^^^^^ definition [..] <Class:N>#m1().
      @@b = @@a
-#    ^^^ definition scip-ruby gem TODO TODO <Class:N>#@@b.
-#          ^^^ reference scip-ruby gem TODO TODO <Class:N>#@@a.
+#    ^^^ definition [..] <Class:N>#@@b.
+#          ^^^ reference [..] <Class:N>#@@a.
      return
    end
  
    def m2
-#  ^^^^^^ definition scip-ruby gem TODO TODO N#m2().
+#  ^^^^^^ definition [..] N#m2().
      @@b = @@a
-#    ^^^ definition scip-ruby gem TODO TODO N#@@b.
-#          ^^^ reference scip-ruby gem TODO TODO N#@@a.
+#    ^^^ definition [..] N#@@b.
+#          ^^^ reference [..] N#@@a.
      return
    end
  
    def m3
-#  ^^^^^^ definition scip-ruby gem TODO TODO N#m3().
+#  ^^^^^^ definition [..] N#m3().
      # FIXME: Missing references
      self.class.b = self.class.a
    end
@@ -90,31 +90,31 @@ def m3
  
  # Accessors
  class P
-#      ^ definition scip-ruby gem TODO TODO P#
+#      ^ definition [..] P#
    attr_accessor :a
-#  ^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO P#a=().
-#  ^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO P#a().
+#  ^^^^^^^^^^^^^^^^ definition [..] P#a=().
+#  ^^^^^^^^^^^^^^^^ definition [..] P#a().
    attr_reader :r
-#  ^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO P#r().
+#  ^^^^^^^^^^^^^^ definition [..] P#r().
    attr_writer :w
-#  ^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO P#w=().
+#  ^^^^^^^^^^^^^^ definition [..] P#w=().
  
    def init
-#  ^^^^^^^^ definition scip-ruby gem TODO TODO P#init().
+#  ^^^^^^^^ definition [..] P#init().
      self.a = self.r
-#         ^^^ reference scip-ruby gem TODO TODO P#a=().
-#                  ^ reference scip-ruby gem TODO TODO P#r().
+#         ^^^ reference [..] P#a=().
+#                  ^ reference [..] P#r().
      self.w = self.a
-#         ^^^ reference scip-ruby gem TODO TODO P#w=().
-#                  ^ reference scip-ruby gem TODO TODO P#a().
+#         ^^^ reference [..] P#w=().
+#                  ^ reference [..] P#a().
    end
  
    def wrong_init
-#  ^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO P#wrong_init().
+#  ^^^^^^^^^^^^^^ definition [..] P#wrong_init().
      # Check that 'r' is a method access but 'a' and 'w' are locals
      a = r
 #    ^ definition local 1~#1021288725
-#        ^ reference scip-ruby gem TODO TODO P#r().
+#        ^ reference [..] P#r().
      w = a
 #    ^ definition local 2~#1021288725
 #    ^^^^^ reference local 2~#1021288725
@@ -123,18 +123,18 @@ def wrong_init
  end
  
  def useP
-#^^^^^^^^ definition scip-ruby gem TODO TODO Object#useP().
+#^^^^^^^^ definition [..] Object#useP().
    p = P.new
 #  ^ definition local 1~#2121829932
-#      ^ reference scip-ruby gem TODO TODO P#
+#      ^ reference [..] P#
    p.a = p.r
 #  ^ reference local 1~#2121829932
-#    ^^^ reference scip-ruby gem TODO TODO P#a=().
+#    ^^^ reference [..] P#a=().
 #        ^ reference local 1~#2121829932
-#          ^ reference scip-ruby gem TODO TODO P#r().
+#          ^ reference [..] P#r().
    p.w = p.a
 #  ^ reference local 1~#2121829932
-#    ^^^ reference scip-ruby gem TODO TODO P#w=().
+#    ^^^ reference [..] P#w=().
 #        ^ reference local 1~#2121829932
-#          ^ reference scip-ruby gem TODO TODO P#a().
+#          ^ reference [..] P#a().
  end
diff --git a/test/scip/testdata/for.snapshot.rb b/test/scip/testdata/for.snapshot.rb
index 6b270f982b..3b275cbffd 100644
--- a/test/scip/testdata/for.snapshot.rb
+++ b/test/scip/testdata/for.snapshot.rb
@@ -1,7 +1,7 @@
  # typed: true
  
  def for_loop()
-#^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#for_loop().
+#^^^^^^^^^^^^^^ definition [..] Object#for_loop().
    y = 0
 #  ^ definition local 1~#1120785331
    for x in [1, 2, 3]
@@ -16,7 +16,7 @@ def for_loop()
 #      ^ reference local 1~#1120785331
 #      ^ reference (write) local 1~#1120785331
 #      ^^^^^^ reference local 1~#1120785331
-#        ^^ reference scip-ruby gem TODO TODO Integer#+().
+#        ^^ reference [..] Integer#+().
 #           ^ reference local 3~#1120785331
      end
    end
diff --git a/test/scip/testdata/functions.snapshot.rb b/test/scip/testdata/functions.snapshot.rb
index 5e95d962f6..f20793284e 100644
--- a/test/scip/testdata/functions.snapshot.rb
+++ b/test/scip/testdata/functions.snapshot.rb
@@ -1,7 +1,7 @@
  # typed: true
  
  def globalFn1()
-#^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#globalFn1().
+#^^^^^^^^^^^^^^^ definition [..] Object#globalFn1().
    x = 10
 #  ^ definition local 1~#3846536873
    x
@@ -9,10 +9,10 @@ def globalFn1()
  end
  
  def globalFn2()
-#^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#globalFn2().
+#^^^^^^^^^^^^^^^ definition [..] Object#globalFn2().
    x = globalFn1()
 #  ^ definition local 1~#3796204016
 #  ^^^^^^^^^^^^^^^ reference local 1~#3796204016
-#      ^^^^^^^^^ reference scip-ruby gem TODO TODO Object#globalFn1().
+#      ^^^^^^^^^ reference [..] Object#globalFn1().
  end
  
diff --git a/test/scip/testdata/gem_metadata.snapshot.rb b/test/scip/testdata/gem_metadata.snapshot.rb
index ea6188dab0..e7d229190a 100644
--- a/test/scip/testdata/gem_metadata.snapshot.rb
+++ b/test/scip/testdata/gem_metadata.snapshot.rb
@@ -2,15 +2,15 @@
  # gem-metadata: leet@1.3.3.7
  
  class C
-#      ^ definition scip-ruby gem leet 1.3.3.7 C#
+#      ^ definition leet 1.3.3.7 C#
    def m
-#  ^^^^^ definition scip-ruby gem leet 1.3.3.7 C#m().
+#  ^^^^^ definition leet 1.3.3.7 C#m().
      n
-#    ^ reference scip-ruby gem leet 1.3.3.7 C#n().
+#    ^ reference leet 1.3.3.7 C#n().
    end
    def n
-#  ^^^^^ definition scip-ruby gem leet 1.3.3.7 C#n().
+#  ^^^^^ definition leet 1.3.3.7 C#n().
      m
-#    ^ reference scip-ruby gem leet 1.3.3.7 C#m().
+#    ^ reference leet 1.3.3.7 C#m().
    end
  end
diff --git a/test/scip/testdata/hashes.snapshot.rb b/test/scip/testdata/hashes.snapshot.rb
index 13f5c4f5a1..8a3cb2b5db 100644
--- a/test/scip/testdata/hashes.snapshot.rb
+++ b/test/scip/testdata/hashes.snapshot.rb
@@ -1,7 +1,7 @@
  # typed: true
  
  def hashes(h, k)
-#^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#hashes().
+#^^^^^^^^^^^^^^^^ definition [..] Object#hashes().
 #           ^ definition local 1~#1685166589
 #              ^ definition local 2~#1685166589
    h["hello"] = "world"
diff --git a/test/scip/testdata/hoverdocs.snapshot.rb b/test/scip/testdata/hoverdocs.snapshot.rb
index 4648efdeff..311db326dd 100644
--- a/test/scip/testdata/hoverdocs.snapshot.rb
+++ b/test/scip/testdata/hoverdocs.snapshot.rb
@@ -3,7 +3,7 @@
  
  # Class doc comment
  class C1
-#      ^^ definition scip-ruby gem TODO TODO C1#
+#      ^^ definition [..] C1#
 #      documentation
 #      | ```ruby
 #      | class C1
@@ -11,7 +11,7 @@ class C1
 #      documentation
 #      | Class doc comment
    def m1
-#  ^^^^^^ definition scip-ruby gem TODO TODO C1#m1().
+#  ^^^^^^ definition [..] C1#m1().
 #  documentation
 #  | ```ruby
 #  | sig {returns(T.untyped)}
@@ -20,12 +20,12 @@ def m1
    end
  
    sig { returns(T::Boolean) }
-#  ^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#<Class:ResolvedSig>#sig().
-#                ^ reference scip-ruby gem TODO TODO T#
-#                   ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
-#                   ^^^^^^^^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#ResolvedSig#
+#  ^^^ reference [..] Sorbet#Private#Static#<Class:ResolvedSig>#sig().
+#                ^ reference [..] T#
+#                   ^^^^^^^ reference [..] T#Boolean.
+#                   ^^^^^^^^^^ reference [..] Sorbet#Private#Static#ResolvedSig#
    def m2
-#  ^^^^^^ definition scip-ruby gem TODO TODO C1#m2().
+#  ^^^^^^ definition [..] C1#m2().
 #  documentation
 #  | ```ruby
 #  | sig {returns(T::Boolean)}
@@ -35,15 +35,15 @@ def m2
    end
  
    sig { params(C, T::Boolean).returns(T::Boolean) }
-#  ^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#<Class:ResolvedSig>#sig().
-#               ^ reference scip-ruby gem TODO TODO T.untyped#
-#                  ^ reference scip-ruby gem TODO TODO T#
-#                     ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
-#                                      ^ reference scip-ruby gem TODO TODO T#
-#                                         ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
-#                                         ^^^^^^^^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#ResolvedSig#
+#  ^^^ reference [..] Sorbet#Private#Static#<Class:ResolvedSig>#sig().
+#               ^ reference [..] T.untyped#
+#                  ^ reference [..] T#
+#                     ^^^^^^^ reference [..] T#Boolean.
+#                                      ^ reference [..] T#
+#                                         ^^^^^^^ reference [..] T#Boolean.
+#                                         ^^^^^^^^^^ reference [..] Sorbet#Private#Static#ResolvedSig#
    def m3(c, b)
-#  ^^^^^^^^^^^^ definition scip-ruby gem TODO TODO C1#m3().
+#  ^^^^^^^^^^^^ definition [..] C1#m3().
 #  documentation
 #  | ```ruby
 #  | sig {params(c: T.untyped, b: T.untyped).returns(T::Boolean)}
@@ -67,7 +67,7 @@ def m3(c, b)
    # _This_ is a
    # **doc comment.**
    def m4(xs)
-#  ^^^^^^^^^^ definition scip-ruby gem TODO TODO C1#m4().
+#  ^^^^^^^^^^ definition [..] C1#m4().
 #  documentation
 #  | ```ruby
 #  | sig {params(xs: T.untyped).returns(T.untyped)}
@@ -88,12 +88,12 @@ def m4(xs)
    # Yet another..
    # ...doc comment
    sig { returns(T::Boolean) }
-#  ^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#<Class:ResolvedSig>#sig().
-#                ^ reference scip-ruby gem TODO TODO T#
-#                   ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
-#                   ^^^^^^^^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#ResolvedSig#
+#  ^^^ reference [..] Sorbet#Private#Static#<Class:ResolvedSig>#sig().
+#                ^ reference [..] T#
+#                   ^^^^^^^ reference [..] T#Boolean.
+#                   ^^^^^^^^^^ reference [..] Sorbet#Private#Static#ResolvedSig#
    def m5
-#  ^^^^^^ definition scip-ruby gem TODO TODO C1#m5().
+#  ^^^^^^ definition [..] C1#m5().
 #  documentation
 #  | ```ruby
 #  | sig {returns(T::Boolean)}
@@ -108,15 +108,15 @@ def m5
    # And...
    # ...one more doc comment
    sig { params(C, T::Boolean).returns(T::Boolean) }
-#  ^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#<Class:ResolvedSig>#sig().
-#               ^ reference scip-ruby gem TODO TODO T.untyped#
-#                  ^ reference scip-ruby gem TODO TODO T#
-#                     ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
-#                                      ^ reference scip-ruby gem TODO TODO T#
-#                                         ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
-#                                         ^^^^^^^^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#ResolvedSig#
+#  ^^^ reference [..] Sorbet#Private#Static#<Class:ResolvedSig>#sig().
+#               ^ reference [..] T.untyped#
+#                  ^ reference [..] T#
+#                     ^^^^^^^ reference [..] T#Boolean.
+#                                      ^ reference [..] T#
+#                                         ^^^^^^^ reference [..] T#Boolean.
+#                                         ^^^^^^^^^^ reference [..] Sorbet#Private#Static#ResolvedSig#
    def m6(c, b)
-#  ^^^^^^^^^^^^ definition scip-ruby gem TODO TODO C1#m6().
+#  ^^^^^^^^^^^^ definition [..] C1#m6().
 #  documentation
 #  | ```ruby
 #  | sig {params(c: T.untyped, b: T.untyped).returns(T::Boolean)}
@@ -142,7 +142,7 @@ def m6(c, b)
  end
  
  class C2 # undocumented class
-#      ^^ definition scip-ruby gem TODO TODO C2#
+#      ^^ definition [..] C2#
 #      documentation
 #      | ```ruby
 #      | class C2
@@ -153,7 +153,7 @@ class C2 # undocumented class
  #
  # Some stuff
  module M1
-#       ^^ definition scip-ruby gem TODO TODO M1#
+#       ^^ definition [..] M1#
 #       documentation
 #       | ```ruby
 #       | module M1
@@ -164,7 +164,7 @@ module M1
 #       | Some stuff
    # This class is nested inside M1
    class C3
-#        ^^ definition scip-ruby gem TODO TODO M1#C3#
+#        ^^ definition [..] M1#C3#
 #        documentation
 #        | ```ruby
 #        | class M1::C3
@@ -175,7 +175,7 @@ class C3
  
    # This module is nested inside M1
    module M2
-#         ^^ definition scip-ruby gem TODO TODO M1#M2#
+#         ^^ definition [..] M1#M2#
 #         documentation
 #         | ```ruby
 #         | module M1::M2
@@ -184,12 +184,12 @@ module M2
 #         | This module is nested inside M1
      # This method is inside M1::M2
      sig { returns(T::Boolean) }
-#    ^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#<Class:ResolvedSig>#sig().
-#                  ^ reference scip-ruby gem TODO TODO T#
-#                     ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
-#                     ^^^^^^^^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#ResolvedSig#
+#    ^^^ reference [..] Sorbet#Private#Static#<Class:ResolvedSig>#sig().
+#                  ^ reference [..] T#
+#                     ^^^^^^^ reference [..] T#Boolean.
+#                     ^^^^^^^^^^ reference [..] Sorbet#Private#Static#ResolvedSig#
      def n1
-#    ^^^^^^ definition scip-ruby gem TODO TODO M1#M2#n1().
+#    ^^^^^^ definition [..] M1#M2#n1().
 #    documentation
 #    | ```ruby
 #    | sig {returns(T::Boolean)}
@@ -202,7 +202,7 @@ def n1
  
      # This method is also inside M1::M2
      def n2
-#    ^^^^^^ definition scip-ruby gem TODO TODO M1#M2#n2().
+#    ^^^^^^ definition [..] M1#M2#n2().
 #    documentation
 #    | ```ruby
 #    | sig {returns(T.untyped)}
@@ -216,7 +216,7 @@ def n2
  
  # This is a global function
  def f1
-#^^^^^^ definition scip-ruby gem TODO TODO Object#f1().
+#^^^^^^ definition [..] Object#f1().
 #documentation
 #| ```ruby
 #| sig {returns(T.untyped)}
@@ -225,21 +225,21 @@ def f1
 #documentation
 #| This is a global function
    M1::M2::m6
-#  ^^ reference scip-ruby gem TODO TODO M1#
-#      ^^ reference scip-ruby gem TODO TODO M1#M2#
+#  ^^ reference [..] M1#
+#      ^^ reference [..] M1#M2#
    M1::M2::m7
-#  ^^ reference scip-ruby gem TODO TODO M1#
-#      ^^ reference scip-ruby gem TODO TODO M1#M2#
+#  ^^ reference [..] M1#
+#      ^^ reference [..] M1#M2#
  end
  
  # Yet another global function
  sig { returns(T::Integer) }
-#^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#<Class:ResolvedSig>#sig().
-#              ^ reference scip-ruby gem TODO TODO T#
-#                 ^^^^^^^ reference scip-ruby gem TODO TODO T.untyped#
-#                 ^^^^^^^^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#ResolvedSig#
+#^^^ reference [..] Sorbet#Private#Static#<Class:ResolvedSig>#sig().
+#              ^ reference [..] T#
+#                 ^^^^^^^ reference [..] T.untyped#
+#                 ^^^^^^^^^^ reference [..] Sorbet#Private#Static#ResolvedSig#
  def f2
-#^^^^^^ definition scip-ruby gem TODO TODO Object#f2().
+#^^^^^^ definition [..] Object#f2().
 #documentation
 #| ```ruby
 #| sig {returns(T::Integer (unresolved))}
@@ -251,7 +251,7 @@ def f2
  end
  
  def f3 # undocumented global function
-#^^^^^^ definition scip-ruby gem TODO TODO Object#f3().
+#^^^^^^ definition [..] Object#f3().
 #documentation
 #| ```ruby
 #| sig {returns(T.untyped)}
@@ -260,12 +260,12 @@ def f3 # undocumented global function
  end
  
  sig { returns(T::Integer) }
-#^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#<Class:ResolvedSig>#sig().
-#              ^ reference scip-ruby gem TODO TODO T#
-#                 ^^^^^^^ reference scip-ruby gem TODO TODO T.untyped#
-#                 ^^^^^^^^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#ResolvedSig#
+#^^^ reference [..] Sorbet#Private#Static#<Class:ResolvedSig>#sig().
+#              ^ reference [..] T#
+#                 ^^^^^^^ reference [..] T.untyped#
+#                 ^^^^^^^^^^ reference [..] Sorbet#Private#Static#ResolvedSig#
  def f4 # another undocumented global function
-#^^^^^^ definition scip-ruby gem TODO TODO Object#f4().
+#^^^^^^ definition [..] Object#f4().
 #documentation
 #| ```ruby
 #| sig {returns(T::Integer (unresolved))}
@@ -276,7 +276,7 @@ def f4 # another undocumented global function
  
  # Parent class
  class K1
-#      ^^ definition scip-ruby gem TODO TODO K1#
+#      ^^ definition [..] K1#
 #      documentation
 #      | ```ruby
 #      | class K1
@@ -285,7 +285,7 @@ class K1
 #      | Parent class
    # sets @x and @@y
    def p1
-#  ^^^^^^ definition scip-ruby gem TODO TODO K1#p1().
+#  ^^^^^^ definition [..] K1#p1().
 #  documentation
 #  | ```ruby
 #  | sig {returns(T.untyped)}
@@ -294,23 +294,23 @@ def p1
 #  documentation
 #  | sets @x and @@y
      @x = 10
-#    ^^ definition scip-ruby gem TODO TODO K1#@x.
+#    ^^ definition [..] K1#@x.
 #    documentation
 #    | ```ruby
 #    | @x = T.let(_, T.untyped)
 #    | ```
      @@y = 10
-#    ^^^ definition scip-ruby gem TODO TODO K1#@@y.
+#    ^^^ definition [..] K1#@@y.
 #    documentation
 #    | ```ruby
 #    | @@y = T.let(_, T.untyped)
 #    | ```
-#    ^^^^^^^^ reference scip-ruby gem TODO TODO K1#@@y.
+#    ^^^^^^^^ reference [..] K1#@@y.
    end
  
    # lorem ipsum, you get it
    def self.p2
-#  ^^^^^^^^^^^ definition scip-ruby gem TODO TODO <Class:K1>#p2().
+#  ^^^^^^^^^^^ definition [..] <Class:K1>#p2().
 #  documentation
 #  | ```ruby
 #  | sig {returns(T.untyped)}
@@ -319,25 +319,25 @@ def self.p2
 #  documentation
 #  | lorem ipsum, you get it
      @z = 10
-#    ^^ definition scip-ruby gem TODO TODO <Class:K1>#@z.
+#    ^^ definition [..] <Class:K1>#@z.
 #    documentation
 #    | ```ruby
 #    | @z = T.let(_, T.untyped)
 #    | ```
-#    ^^^^^^^ reference scip-ruby gem TODO TODO <Class:K1>#@z.
+#    ^^^^^^^ reference [..] <Class:K1>#@z.
    end
  end
  
  # Subclass
  class K2 < K1
-#      ^^ definition scip-ruby gem TODO TODO K2#
+#      ^^ definition [..] K2#
 #      documentation
 #      | ```ruby
 #      | class K2 < K1
 #      | ```
 #      documentation
 #      | Subclass
-#           ^^ definition scip-ruby gem TODO TODO K1#
+#           ^^ definition [..] K1#
 #           documentation
 #           | ```ruby
 #           | class K1
@@ -346,7 +346,7 @@ class K2 < K1
 #           | Parent class
    # doc comment on class var ooh
    @z = 9
-#  ^^ definition scip-ruby gem TODO TODO <Class:K2>#@z.
+#  ^^ definition [..] <Class:K2>#@z.
 #  documentation
 #  | ```ruby
 #  | @z = T.let(_, T.untyped)
@@ -356,7 +356,7 @@ class K2 < K1
  
    # overrides K1's p1
    def p1
-#  ^^^^^^ definition scip-ruby gem TODO TODO K2#p1().
+#  ^^^^^^ definition [..] K2#p1().
 #  documentation
 #  | ```ruby
 #  | sig {returns(T.untyped)}
@@ -365,21 +365,21 @@ def p1
 #  documentation
 #  | overrides K1's p1
      @x = 20
-#    ^^ definition scip-ruby gem TODO TODO K2#@x.
+#    ^^ definition [..] K2#@x.
 #    documentation
 #    | ```ruby
 #    | @x = T.let(_, T.untyped)
 #    | ```
      @@y = 20
-#    ^^^ definition scip-ruby gem TODO TODO K2#@@y.
+#    ^^^ definition [..] K2#@@y.
 #    documentation
 #    | ```ruby
 #    | @@y = T.let(_, T.untyped)
 #    | ```
      @z += @x
-#    ^^ reference scip-ruby gem TODO TODO K2#@z.
-#    ^^ reference (write) scip-ruby gem TODO TODO K2#@z.
-#    ^^^^^^^^ reference scip-ruby gem TODO TODO K2#@z.
-#          ^^ reference scip-ruby gem TODO TODO K2#@x.
+#    ^^ reference [..] K2#@z.
+#    ^^ reference (write) [..] K2#@z.
+#    ^^^^^^^^ reference [..] K2#@z.
+#          ^^ reference [..] K2#@x.
    end
  end
diff --git a/test/scip/testdata/loops_and_conditionals.snapshot.rb b/test/scip/testdata/loops_and_conditionals.snapshot.rb
index 1d589fc7a7..7b3b09a34e 100644
--- a/test/scip/testdata/loops_and_conditionals.snapshot.rb
+++ b/test/scip/testdata/loops_and_conditionals.snapshot.rb
@@ -1,7 +1,7 @@
  # typed: true
  
  def if_elsif_else()
-#^^^^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#if_elsif_else().
+#^^^^^^^^^^^^^^^^^^^ definition [..] Object#if_elsif_else().
    x = 0
 #  ^ definition local 1~#2393773952
    y = 0
@@ -28,7 +28,7 @@ def if_elsif_else()
 #          ^ reference local 1~#2393773952
 #                      ^ reference local 1~#2393773952
 #                               ^ reference local 1~#2393773952
-#                                       ^^ reference scip-ruby gem TODO TODO Integer#==().
+#                                       ^^ reference [..] Integer#==().
        x
 #      ^ reference local 1~#2393773952
      else
@@ -44,7 +44,7 @@ def if_elsif_else()
  end
  
  def unless()
-#^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#unless().
+#^^^^^^^^^^^^ definition [..] Object#unless().
    z = 0
 #  ^ definition local 1~#2827997891
    x = 1
@@ -67,7 +67,7 @@ def unless()
  end
  
  def case(x, y)
-#^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#case().
+#^^^^^^^^^^^^^^ definition [..] Object#case().
 #         ^ definition local 1~#2602907825
 #            ^ definition local 2~#2602907825
    case x
@@ -92,7 +92,7 @@ def case(x, y)
  end
  
  def for(xs)
-#^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#for().
+#^^^^^^^^^^^ definition [..] Object#for().
 #        ^^ definition local 1~#2901640080
    for e in xs
 #      ^ definition local 2~#2901640080
@@ -125,7 +125,7 @@ def for(xs)
  end
  
  def while(xs)
-#^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#while().
+#^^^^^^^^^^^^^ definition [..] Object#while().
 #          ^^ definition local 1~#231090382
    i = 0
 #  ^ definition local 2~#231090382
@@ -162,7 +162,7 @@ def while(xs)
  end
  
  def until(xs)
-#^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#until().
+#^^^^^^^^^^^^^ definition [..] Object#until().
 #          ^^ definition local 1~#3132432719
    i = 0
 #  ^ definition local 2~#3132432719
@@ -199,7 +199,7 @@ def until(xs)
  end
  
  def flip_flop(xs)
-#^^^^^^^^^^^^^^^^^ definition scip-ruby gem TODO TODO Object#flip_flop().
+#^^^^^^^^^^^^^^^^^ definition [..] Object#flip_flop().
 #              ^^ definition local 1~#2191960030
    # NOTE: flip-flops are unsupported (https://srb.help/3003)
    # Unlike redo, which somehow works, we fail to emit references
diff --git a/test/scip/testdata/types.snapshot.rb b/test/scip/testdata/types.snapshot.rb
index 0f8c1e1036..a198f97898 100644
--- a/test/scip/testdata/types.snapshot.rb
+++ b/test/scip/testdata/types.snapshot.rb
@@ -1,26 +1,26 @@
  # typed: true
  
  def f()
-#^^^^^^^ definition scip-ruby gem TODO TODO Object#f().
+#^^^^^^^ definition [..] Object#f().
    T.let(true, T::Boolean)
-#              ^ reference scip-ruby gem TODO TODO T#
-#                 ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
+#              ^ reference [..] T#
+#                 ^^^^^^^ reference [..] T#Boolean.
  end
  
  module M
-#       ^ definition scip-ruby gem TODO TODO M#
+#       ^ definition [..] M#
    module_function
    sig { returns(T::Boolean) }
-#  ^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#<Class:ResolvedSig>#sig().
-#  ^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#<Class:ResolvedSig>#sig().
-#                ^ reference scip-ruby gem TODO TODO T#
-#                   ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
-#                   ^^^^^^^ reference scip-ruby gem TODO TODO T#Boolean.
-#                   ^^^^^^^^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#ResolvedSig#
-#                   ^^^^^^^^^^ reference scip-ruby gem TODO TODO Sorbet#Private#Static#ResolvedSig#
+#  ^^^ reference [..] Sorbet#Private#Static#<Class:ResolvedSig>#sig().
+#  ^^^ reference [..] Sorbet#Private#Static#<Class:ResolvedSig>#sig().
+#                ^ reference [..] T#
+#                   ^^^^^^^ reference [..] T#Boolean.
+#                   ^^^^^^^ reference [..] T#Boolean.
+#                   ^^^^^^^^^^ reference [..] Sorbet#Private#Static#ResolvedSig#
+#                   ^^^^^^^^^^ reference [..] Sorbet#Private#Static#ResolvedSig#
    def b
-#  ^^^^^ definition scip-ruby gem TODO TODO M#b().
-#  ^^^^^ definition scip-ruby gem TODO TODO <Class:M>#b().
+#  ^^^^^ definition [..] M#b().
+#  ^^^^^ definition [..] <Class:M>#b().
      true
    end
  end
diff --git a/test/scip_test_runner.cc b/test/scip_test_runner.cc
index 28db7e7be5..b9264c4790 100644
--- a/test/scip_test_runner.cc
+++ b/test/scip_test_runner.cc
@@ -171,7 +171,8 @@ void formatSnapshot(const scip::Document &document, FormatOptions options, std::
         return isSCIPRangeLess(occ1.range(), occ2.range());
     });
     auto formatSymbol = [](const std::string &symbol) -> string {
-        return symbol; // FIXME(varun): Add customization here!
+        // Strip out repeating information and placeholder names.
+        return absl::StrReplaceAll(symbol, {{"scip-ruby gem ", ""}, {"TODO TODO", "[..]"}});
     };
     size_t occ_i = 0;
     std::ifstream input(document.relative_path());