diff --git a/lib/typeprof/core/service.rb b/lib/typeprof/core/service.rb
index f3541467d..6af349434 100644
--- a/lib/typeprof/core/service.rb
+++ b/lib/typeprof/core/service.rb
@@ -437,7 +437,7 @@ def dump_declarations(path)
         when AST::ModuleNode
           if node.static_cpath
             if event == :enter
-              out << "  " * stack.size + "module #{ node.static_cpath.join("::") }"
+              out << "  " * stack.size + "module #{ format_declared_const_path(node.static_cpath, stack) }"
               if stack == [:toplevel]
                 out << "end"
                 stack.pop
@@ -453,7 +453,7 @@ def dump_declarations(path)
             next if stack.any? { node.is_a?(AST::SingletonClassNode) && (_1.is_a?(AST::ClassNode) || _1.is_a?(AST::ModuleNode)) && node.static_cpath == _1.static_cpath }
 
             if event == :enter
-              s = "class #{ node.static_cpath.join("::") }"
+              s = "class #{ format_declared_const_path(node.static_cpath, stack) }"
               mod = @genv.resolve_cpath(node.static_cpath)
               superclass = mod.superclass
               if superclass == nil
diff --git a/scenario/class/basic2.rb b/scenario/class/basic2.rb
index ddd1da6f8..4aa841bd4 100644
--- a/scenario/class/basic2.rb
+++ b/scenario/class/basic2.rb
@@ -11,7 +11,7 @@ def foo(n)
 
 ## assert
 class C
-  class C::D
+  class D
     def foo: (String) -> singleton(C)
   end
 end
diff --git a/scenario/class/circular_mutual.rb b/scenario/class/circular_mutual.rb
index 9e00aa5b5..5bc029dd9 100644
--- a/scenario/class/circular_mutual.rb
+++ b/scenario/class/circular_mutual.rb
@@ -13,9 +13,9 @@ class Foo < Baz
 class Foo
 end
 class Bar
-  class Bar::Baz < Bar::Foo
+  class Baz < Bar::Foo
   end
-  class Bar::Foo # failed to identify its superclass
+  class Foo # failed to identify its superclass
   end
 end
 
diff --git a/scenario/class/include-hack.rb b/scenario/class/include-hack.rb
index 4d84676f6..bb94c8d85 100644
--- a/scenario/class/include-hack.rb
+++ b/scenario/class/include-hack.rb
@@ -11,7 +11,7 @@ module Baz
 
 ## assert
 module Foo
-  module Foo::Bar
+  module Bar
   end
 end
 module Baz
diff --git a/scenario/class/self-in-cbase.rb b/scenario/class/self-in-cbase.rb
index b17cb01c4..0d8d4a9f0 100644
--- a/scenario/class/self-in-cbase.rb
+++ b/scenario/class/self-in-cbase.rb
@@ -6,7 +6,7 @@ class self::Bar::Baz
 
 ## assert
 class Foo
-  class Foo::Bar::Baz
+  class Bar::Baz
   end
 end
 
diff --git a/scenario/class/unknown-cbase.rb b/scenario/class/unknown-cbase.rb
index 476c16aec..b1f09cc45 100644
--- a/scenario/class/unknown-cbase.rb
+++ b/scenario/class/unknown-cbase.rb
@@ -14,7 +14,7 @@ def check = foo
 
 ## assert: test.rb
 class Foo::Bar
-  class Foo::Bar::C
+  class C
     def foo: -> Integer
   end
 end
@@ -28,7 +28,7 @@ module Foo
 
 ## assert: test.rb
 class Foo::Bar
-  class Foo::Bar::C
+  class C
     def foo: -> Integer
   end
 end
diff --git a/scenario/const/superclass1.rb b/scenario/const/superclass1.rb
index 2a15ed813..4dbe18d9b 100644
--- a/scenario/const/superclass1.rb
+++ b/scenario/const/superclass1.rb
@@ -11,7 +11,7 @@ class E < C
 class C
 end
 class D
-  class D::E < C
+  class E < C
   end
 end
 
@@ -25,7 +25,7 @@ class C # Defining D::C changes the superclass of D::E from ::C to D::C
 class C
 end
 class D
-  class D::E < D::C
+  class E < D::C
   end
 end
 
@@ -38,7 +38,7 @@ class D
 class C
 end
 class D
-  class D::E < C
+  class E < C
   end
 end
 
diff --git a/scenario/const/superclass2.rb b/scenario/const/superclass2.rb
index 1c8bcb985..09c2f3417 100644
--- a/scenario/const/superclass2.rb
+++ b/scenario/const/superclass2.rb
@@ -11,11 +11,11 @@ class C < A::B
 
 ## assert: test0.rb
 class A
-  class A::B
+  class B
   end
 end
 class X
-  class X::C < A::B
+  class C < A::B
   end
 end
 
@@ -28,11 +28,11 @@ class A
 
 ## assert: test0.rb
 class A
-  class A::B
+  class B
   end
 end
 class X
-  class X::C # failed to identify its superclass
+  class C # failed to identify its superclass
   end
 end
 
@@ -47,10 +47,10 @@ class B
 
 ## assert: test0.rb
 class A
-  class A::B
+  class B
   end
 end
 class X
-  class X::C < X::A::B
+  class C < X::A::B
   end
 end
diff --git a/scenario/const/superclass3.rb b/scenario/const/superclass3.rb
index 18b64015d..9d01987f4 100644
--- a/scenario/const/superclass3.rb
+++ b/scenario/const/superclass3.rb
@@ -13,12 +13,12 @@ class D < B
 
 ## assert: test0.rb
 class A
-  class A::B
+  class B
   end
 end
 class X
-  class X::C < A
-    class X::C::D < A::B
+  class C < A
+    class D < A::B
     end
   end
 end
@@ -33,12 +33,12 @@ class B
 
 ## assert: test0.rb
 class A
-  class A::B
+  class B
   end
 end
 class X
-  class X::C < X::A
-    class X::C::D < X::A::B
+  class C < X::A
+    class D < X::A::B
     end
   end
 end
diff --git a/scenario/flow/is_a.rb b/scenario/flow/is_a.rb
index ecfbc7a41..b4ab629ac 100644
--- a/scenario/flow/is_a.rb
+++ b/scenario/flow/is_a.rb
@@ -33,7 +33,7 @@ def foo(n)
 
 ## assert
 class C
-  class C::D
+  class D
   end
   def foo: (C::D | Integer) -> (C::D | String)
 end
diff --git a/scenario/incremental/add-included-module.rb b/scenario/incremental/add-included-module.rb
index 724d9f42a..7e47e4e18 100644
--- a/scenario/incremental/add-included-module.rb
+++ b/scenario/incremental/add-included-module.rb
@@ -31,7 +31,7 @@ def initialize(n)
 
 ## assert: test1.rb
 module M
-  class M::A
+  class A
     def initialize: (Integer) -> void
   end
 end
diff --git a/scenario/incremental/basic4.rb b/scenario/incremental/basic4.rb
index 0655f1bf4..7943173a7 100644
--- a/scenario/incremental/basic4.rb
+++ b/scenario/incremental/basic4.rb
@@ -22,7 +22,7 @@ def foo(n)
 
 ## assert
 class C
-  class C::C
+  class C
   end
   def foo: (untyped) -> singleton(C::C)
 end
@@ -39,7 +39,7 @@ def foo(n)
 
 ## assert
 class C
-  class C::D
+  class D
   end
   def foo: (untyped) -> singleton(C)
 end
diff --git a/scenario/incremental/change-included-module.rb b/scenario/incremental/change-included-module.rb
index 8a0543d4a..2a129457f 100644
--- a/scenario/incremental/change-included-module.rb
+++ b/scenario/incremental/change-included-module.rb
@@ -36,7 +36,7 @@ class C
 
 ## assert: test1.rb
 class C
-  module C::M
+  module M
     def foo: (Integer) -> nil
   end
 end
diff --git a/scenario/incremental/change-superclass.rb b/scenario/incremental/change-superclass.rb
index cb607e86c..f7d508e7e 100644
--- a/scenario/incremental/change-superclass.rb
+++ b/scenario/incremental/change-superclass.rb
@@ -21,7 +21,7 @@ class C2
   def target: (untyped) -> untyped
 end
 class X
-  class X::D < C
+  class D < C
     def foo: -> Integer
   end
 end
@@ -42,7 +42,7 @@ class C2
   def target: (Integer) -> Integer
 end
 class X
-  class X::D < X::C
+  class D < X::C
     def foo: -> Integer
   end
 end
diff --git a/scenario/variable/ivar3.rb b/scenario/variable/ivar3.rb
index c8a16e4e1..5adb8b5d3 100644
--- a/scenario/variable/ivar3.rb
+++ b/scenario/variable/ivar3.rb
@@ -19,7 +19,7 @@ def foo: -> :C
   def x: -> (:C | :E)
 end
 class X
-  class X::D < C
+  class D < C
   end
 end
 class E < X::D
@@ -40,7 +40,7 @@ def foo: -> :C
   def x: -> :C
 end
 class X
-  class X::D < X::C
+  class D < X::C
   end
 end
 class E < X::D
@@ -49,7 +49,7 @@ def foo: -> :E
 
 ## assert: test1.rb
 class X
-  class X::C
+  class C
     def foo: -> :XC
     def x: -> (:E | :XC)
   end