diff --git a/examples/covering-seq/tests/gens/print/DerivedGen.idr b/examples/covering-seq/tests/gens/print/DerivedGen.idr
index 1d7d38705..fa3a36e6d 100644
--- a/examples/covering-seq/tests/gens/print/DerivedGen.idr
+++ b/examples/covering-seq/tests/gens/print/DerivedGen.idr
@@ -1,11 +1,12 @@
 module DerivedGen
 
-import PrintDerivation
-
 import Data.List.Covering
 
+import Deriving.DepTyCheck.Gen
+
 %default total
 
 %language ElabReflection
 
-%runElab printDerived $ Fuel -> {n : Nat} -> (bs : BitMask n) -> Gen MaybeEmpty $ CoveringSequence n bs
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter $ Fuel -> {n : Nat} -> (bs : BitMask n) -> Gen MaybeEmpty $ CoveringSequence n bs
diff --git a/examples/covering-seq/tests/gens/print/PrintDerivation.idr b/examples/covering-seq/tests/gens/print/PrintDerivation.idr
deleted file mode 120000
index af4998fcf..000000000
--- a/examples/covering-seq/tests/gens/print/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tests/derivation/_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/examples/covering-seq/tests/gens/print/expected b/examples/covering-seq/tests/gens/print/expected
index 9899c0753..5c91b882b 100644
--- a/examples/covering-seq/tests/gens/print/expected
+++ b/examples/covering-seq/tests/gens/print/expected
@@ -1,7 +1,5 @@
-1/2: Building PrintDerivation (PrintDerivation.idr)
-2/2: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (bs : BitMask n) -> Gen MaybeEmpty (CoveringSequence n bs)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (bs : BitMask n) -> Gen MaybeEmpty (CoveringSequence n bs)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ImplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<bs>") implicitTrue
diff --git a/examples/sorted-list/tests/gens/print/DerivedGen.idr b/examples/sorted-list/tests/gens/print/DerivedGen.idr
index aa7533642..36dc705d8 100644
--- a/examples/sorted-list/tests/gens/print/DerivedGen.idr
+++ b/examples/sorted-list/tests/gens/print/DerivedGen.idr
@@ -1,11 +1,12 @@
 module DerivedGen
 
-import PrintDerivation
-
 import Data.List.Sorted
 
+import Deriving.DepTyCheck.Gen
+
 %default total
 
 %language ElabReflection
 
-%runElab printDerived $ Fuel -> Gen MaybeEmpty SortedList
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter $ Fuel -> Gen MaybeEmpty SortedList
diff --git a/examples/sorted-list/tests/gens/print/PrintDerivation.idr b/examples/sorted-list/tests/gens/print/PrintDerivation.idr
deleted file mode 120000
index af4998fcf..000000000
--- a/examples/sorted-list/tests/gens/print/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../tests/derivation/_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/examples/sorted-list/tests/gens/print/expected b/examples/sorted-list/tests/gens/print/expected
index 66f4e31ee..898ce62cf 100644
--- a/examples/sorted-list/tests/gens/print/expected
+++ b/examples/sorted-list/tests/gens/print/expected
@@ -1,7 +1,5 @@
-1/2: Building PrintDerivation (PrintDerivation.idr)
-2/2: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty SortedList
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty SortedList
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/src/Deriving/DepTyCheck/Gen/Entry.idr b/src/Deriving/DepTyCheck/Gen/Entry.idr
index a593f75fb..299598bc7 100644
--- a/src/Deriving/DepTyCheck/Gen/Entry.idr
+++ b/src/Deriving/DepTyCheck/Gen/Entry.idr
@@ -371,3 +371,18 @@ deriveGenFor a = do
   sig <- quote a
   tt <- deriveGenExpr sig
   check tt
+
+||| Declares `main : IO Unit` function that prints derived generator for the given generator's signature
+export
+deriveGenPrinter : DerivatorCore => Type -> Elab Unit
+deriveGenPrinter ty = do
+  ty <- quote ty
+  logSugaredTerm "deptycheck.derive.print" DefaultLogLevel "type" ty
+  expr <- deriveGenExpr ty
+  expr <- quote expr
+  declare `[
+    main : IO Unit
+    main = do
+      putStr $ interpolate ~(expr)
+      putStrLn ""
+  ]
diff --git a/tests/derivation/_common/PrintDerivation.idr b/tests/derivation/_common/PrintDerivation.idr
deleted file mode 100644
index df823d42f..000000000
--- a/tests/derivation/_common/PrintDerivation.idr
+++ /dev/null
@@ -1,20 +0,0 @@
-module PrintDerivation
-
-import public Deriving.DepTyCheck.Gen
-
-%language ElabReflection
-
-export covering
-printDerived : DerivatorCore => Type -> Elab Unit
-printDerived ty = do
-  ty <- quote ty
-  logSugaredTerm "gen.auto.derive.infra" 0 "type" ty
-  expr <- deriveGenExpr ty
-  expr <- quote expr
-  declare `[
-    main : IO Unit
-    main = do
-      putStrLn "LOG gen.auto.derive.infra:0: " -- mimic the original logging behaviour
-      putStr $ interpolate ~(expr)
-      putStrLn ""
-  ]
diff --git a/tests/derivation/infra/empty-body print 001/DerivedGen.idr b/tests/derivation/infra/empty-body print 001/DerivedGen.idr
index 707762202..4a128870f 100644
--- a/tests/derivation/infra/empty-body print 001/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body print 001/DerivedGen.idr	
@@ -1,10 +1,12 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyBody} $ Fuel -> Gen MaybeEmpty Unit
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyBody} $ Fuel -> Gen MaybeEmpty Unit
diff --git a/tests/derivation/infra/empty-body print 001/PrintDerivation.idr b/tests/derivation/infra/empty-body print 001/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-body print 001/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-body print 001/expected b/tests/derivation/infra/empty-body print 001/expected
index c81b9d826..71e4419a3 100644
--- a/tests/derivation/infra/empty-body print 001/expected	
+++ b/tests/derivation/infra/empty-body print 001/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty ()
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty ()
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-body print 002/DerivedGen.idr b/tests/derivation/infra/empty-body print 002/DerivedGen.idr
index 6ccb1ca49..608697535 100644
--- a/tests/derivation/infra/empty-body print 002/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body print 002/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyBody} $ Fuel -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyBody} $ Fuel -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
diff --git a/tests/derivation/infra/empty-body print 002/PrintDerivation.idr b/tests/derivation/infra/empty-body print 002/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-body print 002/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-body print 002/expected b/tests/derivation/infra/empty-body print 002/expected
index 8f69d0170..1fcb35f76 100644
--- a/tests/derivation/infra/empty-body print 002/expected	
+++ b/tests/derivation/infra/empty-body print 002/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
diff --git a/tests/derivation/infra/empty-body print 003/DerivedGen.idr b/tests/derivation/infra/empty-body print 003/DerivedGen.idr
index 338a29b65..4736fff83 100644
--- a/tests/derivation/infra/empty-body print 003/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body print 003/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyBody} $ Fuel -> (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty Bool
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyBody} $ Fuel -> (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty Bool
diff --git a/tests/derivation/infra/empty-body print 003/PrintDerivation.idr b/tests/derivation/infra/empty-body print 003/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-body print 003/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-body print 003/expected b/tests/derivation/infra/empty-body print 003/expected
index 53dd5fcfe..bc50b25ec 100644
--- a/tests/derivation/infra/empty-body print 003/expected	
+++ b/tests/derivation/infra/empty-body print 003/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty Bool
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty Bool
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/infra/empty-body print 004/DerivedGen.idr b/tests/derivation/infra/empty-body print 004/DerivedGen.idr
index 00548c40b..6c981ad1d 100644
--- a/tests/derivation/infra/empty-body print 004/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body print 004/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +11,5 @@ import PrintDerivation
 data X : Nat -> Type where
   MkX : X n
 
-%runElab printDerived @{EmptyBody} $ Fuel -> (n : Nat) -> Gen MaybeEmpty (X n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyBody} $ Fuel -> (n : Nat) -> Gen MaybeEmpty (X n)
diff --git a/tests/derivation/infra/empty-body print 004/PrintDerivation.idr b/tests/derivation/infra/empty-body print 004/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-body print 004/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-body print 004/expected b/tests/derivation/infra/empty-body print 004/expected
index 6998286dc..3656c1094 100644
--- a/tests/derivation/infra/empty-body print 004/expected	
+++ b/tests/derivation/infra/empty-body print 004/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (X n)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (X n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> local
diff --git a/tests/derivation/infra/empty-body print 005/DerivedGen.idr b/tests/derivation/infra/empty-body print 005/DerivedGen.idr
index 697beb796..3ee2ecbd5 100644
--- a/tests/derivation/infra/empty-body print 005/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body print 005/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +11,5 @@ import PrintDerivation
 data X : Nat -> Type where
   MkX : X n
 
-%runElab printDerived @{EmptyBody} $ Fuel -> Gen MaybeEmpty (n : Nat ** X n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyBody} $ Fuel -> Gen MaybeEmpty (n : Nat ** X n)
diff --git a/tests/derivation/infra/empty-body print 005/PrintDerivation.idr b/tests/derivation/infra/empty-body print 005/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-body print 005/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-body print 005/expected b/tests/derivation/infra/empty-body print 005/expected
index 899db2799..7bc0c78ca 100644
--- a/tests/derivation/infra/empty-body print 005/expected	
+++ b/tests/derivation/infra/empty-body print 005/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** X n)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** X n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-body print 006/DerivedGen.idr b/tests/derivation/infra/empty-body print 006/DerivedGen.idr
index 000763bd5..3cc007dfe 100644
--- a/tests/derivation/infra/empty-body print 006/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body print 006/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyBody} $ Fuel -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyBody} $ Fuel -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
diff --git a/tests/derivation/infra/empty-body print 006/PrintDerivation.idr b/tests/derivation/infra/empty-body print 006/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-body print 006/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-body print 006/expected b/tests/derivation/infra/empty-body print 006/expected
index 04ad08858..e5c8b0818 100644
--- a/tests/derivation/infra/empty-body print 006/expected	
+++ b/tests/derivation/infra/empty-body print 006/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> local
diff --git a/tests/derivation/infra/empty-body print 007/DerivedGen.idr b/tests/derivation/infra/empty-body print 007/DerivedGen.idr
index 5e89f1f16..e331d8454 100644
--- a/tests/derivation/infra/empty-body print 007/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body print 007/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +12,5 @@ data X : Nat -> Bool -> Type where
   X0 : X 0 True
   X1 : X 1 False
 
-%runElab printDerived @{EmptyBody} $ Fuel -> Gen MaybeEmpty (n : Nat ** b : Bool ** X n b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyBody} $ Fuel -> Gen MaybeEmpty (n : Nat ** b : Bool ** X n b)
diff --git a/tests/derivation/infra/empty-body print 007/PrintDerivation.idr b/tests/derivation/infra/empty-body print 007/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-body print 007/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-body print 007/expected b/tests/derivation/infra/empty-body print 007/expected
index 964edff1e..6414736b2 100644
--- a/tests/derivation/infra/empty-body print 007/expected	
+++ b/tests/derivation/infra/empty-body print 007/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (b : Bool ** X n b))
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (b : Bool ** X n b))
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-body print 008/DerivedGen.idr b/tests/derivation/infra/empty-body print 008/DerivedGen.idr
index ffc8df140..7a5dc3b10 100644
--- a/tests/derivation/infra/empty-body print 008/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body print 008/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyBody} $ Fuel -> Gen MaybeEmpty (n : Nat ** a : Type ** Vect n a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyBody} $ Fuel -> Gen MaybeEmpty (n : Nat ** a : Type ** Vect n a)
diff --git a/tests/derivation/infra/empty-body print 008/PrintDerivation.idr b/tests/derivation/infra/empty-body print 008/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-body print 008/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-body print 008/expected b/tests/derivation/infra/empty-body print 008/expected
index ad829c609..6aa83e147 100644
--- a/tests/derivation/infra/empty-body print 008/expected	
+++ b/tests/derivation/infra/empty-body print 008/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (a : Type ** Vect n a))
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (a : Type ** Vect n a))
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-body run 001/DerivedGen.idr b/tests/derivation/infra/empty-body run 001/DerivedGen.idr
index 179fb5889..11601bc34 100644
--- a/tests/derivation/infra/empty-body run 001/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 001/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-body run 002/DerivedGen.idr b/tests/derivation/infra/empty-body run 002/DerivedGen.idr
index a183f8a1d..aa30d7074 100644
--- a/tests/derivation/infra/empty-body run 002/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 002/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-body run 003/DerivedGen.idr b/tests/derivation/infra/empty-body run 003/DerivedGen.idr
index ec915a6e1..31454d85f 100644
--- a/tests/derivation/infra/empty-body run 003/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 003/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-body run 004/DerivedGen.idr b/tests/derivation/infra/empty-body run 004/DerivedGen.idr
index 08d11cf91..7b0724d27 100644
--- a/tests/derivation/infra/empty-body run 004/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 004/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-body run 005/DerivedGen.idr b/tests/derivation/infra/empty-body run 005/DerivedGen.idr
index 4255d61e0..52b09c0ec 100644
--- a/tests/derivation/infra/empty-body run 005/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 005/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-body run 006/DerivedGen.idr b/tests/derivation/infra/empty-body run 006/DerivedGen.idr
index 3bdc005f3..19feea850 100644
--- a/tests/derivation/infra/empty-body run 006/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 006/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-body run 007/DerivedGen.idr b/tests/derivation/infra/empty-body run 007/DerivedGen.idr
index 2bf934cf6..39c78a5f5 100644
--- a/tests/derivation/infra/empty-body run 007/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 007/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-body run 008/DerivedGen.idr b/tests/derivation/infra/empty-body run 008/DerivedGen.idr
index 223e89e4e..9794ffbdf 100644
--- a/tests/derivation/infra/empty-body run 008/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 008/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-body run 009/DerivedGen.idr b/tests/derivation/infra/empty-body run 009/DerivedGen.idr
index 72970a807..7a4c97d2f 100644
--- a/tests/derivation/infra/empty-body run 009/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 009/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-body run 010/DerivedGen.idr b/tests/derivation/infra/empty-body run 010/DerivedGen.idr
index 6ba0dafe0..03af4c547 100644
--- a/tests/derivation/infra/empty-body run 010/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-body run 010/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-cons print 001/DerivedGen.idr b/tests/derivation/infra/empty-cons print 001/DerivedGen.idr
index 174aa2f99..812400639 100644
--- a/tests/derivation/infra/empty-cons print 001/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 001/DerivedGen.idr	
@@ -1,10 +1,12 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyCons} $ Fuel -> Gen MaybeEmpty Unit
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> Gen MaybeEmpty Unit
diff --git a/tests/derivation/infra/empty-cons print 001/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 001/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 001/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 001/expected b/tests/derivation/infra/empty-cons print 001/expected
index 5d0b89f05..780b1b949 100644
--- a/tests/derivation/infra/empty-cons print 001/expected	
+++ b/tests/derivation/infra/empty-cons print 001/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty ()
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty ()
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-cons print 002/DerivedGen.idr b/tests/derivation/infra/empty-cons print 002/DerivedGen.idr
index ec8ff714d..48a020982 100644
--- a/tests/derivation/infra/empty-cons print 002/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 002/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyCons} $ Fuel -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
diff --git a/tests/derivation/infra/empty-cons print 002/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 002/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 002/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 002/expected b/tests/derivation/infra/empty-cons print 002/expected
index 0d83db953..5af4ddcc8 100644
--- a/tests/derivation/infra/empty-cons print 002/expected	
+++ b/tests/derivation/infra/empty-cons print 002/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
diff --git a/tests/derivation/infra/empty-cons print 003/DerivedGen.idr b/tests/derivation/infra/empty-cons print 003/DerivedGen.idr
index 8ffcbb66b..9394df3e2 100644
--- a/tests/derivation/infra/empty-cons print 003/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 003/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyCons} $ Fuel -> (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty Bool
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty Bool
diff --git a/tests/derivation/infra/empty-cons print 003/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 003/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 003/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 003/expected b/tests/derivation/infra/empty-cons print 003/expected
index 77bfb10c5..63fdc9f12 100644
--- a/tests/derivation/infra/empty-cons print 003/expected	
+++ b/tests/derivation/infra/empty-cons print 003/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty Bool
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty Bool
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/infra/empty-cons print 004/DerivedGen.idr b/tests/derivation/infra/empty-cons print 004/DerivedGen.idr
index 666594b7d..60695cfbc 100644
--- a/tests/derivation/infra/empty-cons print 004/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 004/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +11,5 @@ import PrintDerivation
 data X : Nat -> Type where
   MkX : X n
 
-%runElab printDerived @{EmptyCons} $ Fuel -> (n : Nat) -> Gen MaybeEmpty (X n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> (n : Nat) -> Gen MaybeEmpty (X n)
diff --git a/tests/derivation/infra/empty-cons print 004/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 004/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 004/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 004/expected b/tests/derivation/infra/empty-cons print 004/expected
index fc8338a92..564735447 100644
--- a/tests/derivation/infra/empty-cons print 004/expected	
+++ b/tests/derivation/infra/empty-cons print 004/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (X n)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (X n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> local
diff --git a/tests/derivation/infra/empty-cons print 005/DerivedGen.idr b/tests/derivation/infra/empty-cons print 005/DerivedGen.idr
index de81a51cf..d65e5bb8f 100644
--- a/tests/derivation/infra/empty-cons print 005/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 005/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +11,5 @@ import PrintDerivation
 data X : Nat -> Type where
   MkX : X n
 
-%runElab printDerived @{EmptyCons} $ Fuel -> Gen MaybeEmpty (n : Nat ** X n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> Gen MaybeEmpty (n : Nat ** X n)
diff --git a/tests/derivation/infra/empty-cons print 005/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 005/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 005/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 005/expected b/tests/derivation/infra/empty-cons print 005/expected
index 38f31f476..ac6ef9ca3 100644
--- a/tests/derivation/infra/empty-cons print 005/expected	
+++ b/tests/derivation/infra/empty-cons print 005/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** X n)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** X n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-cons print 006/DerivedGen.idr b/tests/derivation/infra/empty-cons print 006/DerivedGen.idr
index 5d9757ed5..04ab501ae 100644
--- a/tests/derivation/infra/empty-cons print 006/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 006/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyCons} $ Fuel -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
diff --git a/tests/derivation/infra/empty-cons print 006/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 006/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 006/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 006/expected b/tests/derivation/infra/empty-cons print 006/expected
index eb3025a1d..9456e8d53 100644
--- a/tests/derivation/infra/empty-cons print 006/expected	
+++ b/tests/derivation/infra/empty-cons print 006/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> local
diff --git a/tests/derivation/infra/empty-cons print 007/DerivedGen.idr b/tests/derivation/infra/empty-cons print 007/DerivedGen.idr
index 3354fc041..3c6534967 100644
--- a/tests/derivation/infra/empty-cons print 007/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 007/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +12,5 @@ data X : Nat -> Bool -> Type where
   X0 : X 0 True
   X1 : X 1 False
 
-%runElab printDerived @{EmptyCons} $ Fuel -> Gen MaybeEmpty (n : Nat ** b : Bool ** X n b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> Gen MaybeEmpty (n : Nat ** b : Bool ** X n b)
diff --git a/tests/derivation/infra/empty-cons print 007/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 007/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 007/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 007/expected b/tests/derivation/infra/empty-cons print 007/expected
index 0640fcd26..713ce0aeb 100644
--- a/tests/derivation/infra/empty-cons print 007/expected	
+++ b/tests/derivation/infra/empty-cons print 007/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (b : Bool ** X n b))
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (b : Bool ** X n b))
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-cons print 008/DerivedGen.idr b/tests/derivation/infra/empty-cons print 008/DerivedGen.idr
index a0d9d1cea..408c71149 100644
--- a/tests/derivation/infra/empty-cons print 008/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 008/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{EmptyCons} $ Fuel -> Gen MaybeEmpty (n : Nat ** a : Type ** Vect n a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> Gen MaybeEmpty (n : Nat ** a : Type ** Vect n a)
diff --git a/tests/derivation/infra/empty-cons print 008/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 008/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 008/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 008/expected b/tests/derivation/infra/empty-cons print 008/expected
index af637b8de..83cf584f3 100644
--- a/tests/derivation/infra/empty-cons print 008/expected	
+++ b/tests/derivation/infra/empty-cons print 008/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (a : Type ** Vect n a))
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (a : Type ** Vect n a))
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-cons print 009/DerivedGen.idr b/tests/derivation/infra/empty-cons print 009/DerivedGen.idr
index a5fa391bd..b93385a0e 100644
--- a/tests/derivation/infra/empty-cons print 009/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 009/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -13,4 +14,5 @@ data Y = Y0 | Y1
 
 data X = X0 | X1 | X2 Y
 
-%runElab printDerived @{EmptyCons} $ Fuel -> Gen MaybeEmpty X
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> Gen MaybeEmpty X
diff --git a/tests/derivation/infra/empty-cons print 009/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 009/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 009/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 009/expected b/tests/derivation/infra/empty-cons print 009/expected
index 10ca690a7..4ad564f4f 100644
--- a/tests/derivation/infra/empty-cons print 009/expected	
+++ b/tests/derivation/infra/empty-cons print 009/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty X
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty X
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-cons print 010/DerivedGen.idr b/tests/derivation/infra/empty-cons print 010/DerivedGen.idr
index f95bc7f39..6f3e5abce 100644
--- a/tests/derivation/infra/empty-cons print 010/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 010/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -15,4 +16,5 @@ mutual
 
   data Y = Y0 | Y1 X
 
-%runElab printDerived @{EmptyCons} $ Fuel -> Gen MaybeEmpty X
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> Gen MaybeEmpty X
diff --git a/tests/derivation/infra/empty-cons print 010/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 010/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 010/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 010/expected b/tests/derivation/infra/empty-cons print 010/expected
index 53d5ba91e..d25471a4e 100644
--- a/tests/derivation/infra/empty-cons print 010/expected	
+++ b/tests/derivation/infra/empty-cons print 010/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty X
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty X
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-cons print 011/DerivedGen.idr b/tests/derivation/infra/empty-cons print 011/DerivedGen.idr
index aa9edc64f..4418873e6 100644
--- a/tests/derivation/infra/empty-cons print 011/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 011/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -18,4 +19,5 @@ mutual
 
   data Y = Y0 | Y1 (X Nat)
 
-%runElab printDerived @{EmptyCons} $ Fuel -> Gen MaybeEmpty (a ** X a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> Gen MaybeEmpty (a ** X a)
diff --git a/tests/derivation/infra/empty-cons print 011/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 011/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 011/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 011/expected b/tests/derivation/infra/empty-cons print 011/expected
index 0dc0775c7..48adcc7a6 100644
--- a/tests/derivation/infra/empty-cons print 011/expected	
+++ b/tests/derivation/infra/empty-cons print 011/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (a : Type ** X a)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (a : Type ** X a)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/empty-cons print 012/DerivedGen.idr b/tests/derivation/infra/empty-cons print 012/DerivedGen.idr
index 7616b9251..f8ed69365 100644
--- a/tests/derivation/infra/empty-cons print 012/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 012/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +12,5 @@ data X : Nat -> Nat -> Type where
   XE : X n n
   XS : X n (S n)
 
-%runElab printDerived @{EmptyCons} $ Fuel -> (n, m : Nat) -> Gen MaybeEmpty (X n m)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> (n, m : Nat) -> Gen MaybeEmpty (X n m)
diff --git a/tests/derivation/infra/empty-cons print 012/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 012/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 012/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 012/expected b/tests/derivation/infra/empty-cons print 012/expected
index 695f6dec0..4a6e4b0dd 100644
--- a/tests/derivation/infra/empty-cons print 012/expected	
+++ b/tests/derivation/infra/empty-cons print 012/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> (m : Nat) -> Gen MaybeEmpty (X n m)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> (m : Nat) -> Gen MaybeEmpty (X n m)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<m>") implicitTrue
diff --git a/tests/derivation/infra/empty-cons print 013/DerivedGen.idr b/tests/derivation/infra/empty-cons print 013/DerivedGen.idr
index 0122e9482..c5e5b144b 100644
--- a/tests/derivation/infra/empty-cons print 013/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 013/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +12,5 @@ data X : Nat -> Nat -> Nat -> Nat -> Type where
   XE : X n (S n) m n
   XS : X n n m m
 
-%runElab printDerived @{EmptyCons} $ Fuel -> (n, m, p, k : Nat) -> Gen MaybeEmpty (X n m p k)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> (n, m, p, k : Nat) -> Gen MaybeEmpty (X n m p k)
diff --git a/tests/derivation/infra/empty-cons print 013/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 013/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 013/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 013/expected b/tests/derivation/infra/empty-cons print 013/expected
index 45c47dae3..1d56384a4 100644
--- a/tests/derivation/infra/empty-cons print 013/expected	
+++ b/tests/derivation/infra/empty-cons print 013/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> (m : Nat) -> (p : Nat) -> (k : Nat) -> Gen MaybeEmpty (X n m p k)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> (m : Nat) -> (p : Nat) -> (k : Nat) -> Gen MaybeEmpty (X n m p k)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<m>") implicitTrue
diff --git a/tests/derivation/infra/empty-cons print 014/DerivedGen.idr b/tests/derivation/infra/empty-cons print 014/DerivedGen.idr
index a6956b7bf..ca50589d1 100644
--- a/tests/derivation/infra/empty-cons print 014/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons print 014/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +12,5 @@ data X : Nat -> Nat -> Nat -> Nat -> Type where
   XE : X n (S n) m n
   XS : X n n m m
 
-%runElab printDerived @{EmptyCons} $ Fuel -> (n, m, p, k : Nat) -> (Fuel -> Gen MaybeEmpty String) => Gen MaybeEmpty (X n m p k)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{EmptyCons} $ Fuel -> (n, m, p, k : Nat) -> (Fuel -> Gen MaybeEmpty String) => Gen MaybeEmpty (X n m p k)
diff --git a/tests/derivation/infra/empty-cons print 014/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 014/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/empty-cons print 014/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/empty-cons print 014/expected b/tests/derivation/infra/empty-cons print 014/expected
index 2668f6c7e..51ab66a5d 100644
--- a/tests/derivation/infra/empty-cons print 014/expected	
+++ b/tests/derivation/infra/empty-cons print 014/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> (m : Nat) -> (p : Nat) -> (k : Nat) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> Gen MaybeEmpty (X n m p k)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> (m : Nat) -> (p : Nat) -> (k : Nat) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> Gen MaybeEmpty (X n m p k)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<m>") implicitTrue
diff --git a/tests/derivation/infra/empty-cons run 001/DerivedGen.idr b/tests/derivation/infra/empty-cons run 001/DerivedGen.idr
index 29ce2d122..cec0f366a 100644
--- a/tests/derivation/infra/empty-cons run 001/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 001/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-cons run 002/DerivedGen.idr b/tests/derivation/infra/empty-cons run 002/DerivedGen.idr
index fc3f2660e..11a7d4741 100644
--- a/tests/derivation/infra/empty-cons run 002/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 002/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-cons run 003/DerivedGen.idr b/tests/derivation/infra/empty-cons run 003/DerivedGen.idr
index 0525072a7..d22833d87 100644
--- a/tests/derivation/infra/empty-cons run 003/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 003/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-cons run 004/DerivedGen.idr b/tests/derivation/infra/empty-cons run 004/DerivedGen.idr
index ba95523fd..6afadba8b 100644
--- a/tests/derivation/infra/empty-cons run 004/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 004/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-cons run 005/DerivedGen.idr b/tests/derivation/infra/empty-cons run 005/DerivedGen.idr
index ba577e726..821495369 100644
--- a/tests/derivation/infra/empty-cons run 005/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 005/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-cons run 006/DerivedGen.idr b/tests/derivation/infra/empty-cons run 006/DerivedGen.idr
index 8fc0b01a8..ebe704a27 100644
--- a/tests/derivation/infra/empty-cons run 006/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 006/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/empty-cons run 007/DerivedGen.idr b/tests/derivation/infra/empty-cons run 007/DerivedGen.idr
index 415b6dc20..767b352ec 100644
--- a/tests/derivation/infra/empty-cons run 007/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 007/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-cons run 008/DerivedGen.idr b/tests/derivation/infra/empty-cons run 008/DerivedGen.idr
index d58378f55..1db5cdd2a 100644
--- a/tests/derivation/infra/empty-cons run 008/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 008/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-cons run 009/DerivedGen.idr b/tests/derivation/infra/empty-cons run 009/DerivedGen.idr
index c61d42557..ff1c939c2 100644
--- a/tests/derivation/infra/empty-cons run 009/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 009/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-cons run 010/DerivedGen.idr b/tests/derivation/infra/empty-cons run 010/DerivedGen.idr
index daaa327de..79145adf2 100644
--- a/tests/derivation/infra/empty-cons run 010/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 010/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-cons run 011/DerivedGen.idr b/tests/derivation/infra/empty-cons run 011/DerivedGen.idr
index 4952a54d8..efac204d0 100644
--- a/tests/derivation/infra/empty-cons run 011/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 011/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-cons run 012/DerivedGen.idr b/tests/derivation/infra/empty-cons run 012/DerivedGen.idr
index 23326bcb9..03d41e6aa 100644
--- a/tests/derivation/infra/empty-cons run 012/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 012/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-cons run 013/DerivedGen.idr b/tests/derivation/infra/empty-cons run 013/DerivedGen.idr
index 13098ebf9..640b2de09 100644
--- a/tests/derivation/infra/empty-cons run 013/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 013/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/empty-cons run 014/DerivedGen.idr b/tests/derivation/infra/empty-cons run 014/DerivedGen.idr
index e393d3b80..026b35903 100644
--- a/tests/derivation/infra/empty-cons run 014/DerivedGen.idr	
+++ b/tests/derivation/infra/empty-cons run 014/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/ext print 001/DerivedGen.idr b/tests/derivation/infra/ext print 001/DerivedGen.idr
index 46a527742..b5cbac9ea 100644
--- a/tests/derivation/infra/ext print 001/DerivedGen.idr	
+++ b/tests/derivation/infra/ext print 001/DerivedGen.idr	
@@ -1,10 +1,12 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{Ext_XS} $ Fuel -> (Fuel -> Gen MaybeEmpty String) => Gen MaybeEmpty XS
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{Ext_XS} $ Fuel -> (Fuel -> Gen MaybeEmpty String) => Gen MaybeEmpty XS
diff --git a/tests/derivation/infra/ext print 001/PrintDerivation.idr b/tests/derivation/infra/ext print 001/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/ext print 001/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/ext print 001/expected b/tests/derivation/infra/ext print 001/expected
index 498f02751..645037a72 100644
--- a/tests/derivation/infra/ext print 001/expected	
+++ b/tests/derivation/infra/ext print 001/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> Gen MaybeEmpty XS
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> Gen MaybeEmpty XS
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/infra/ext print 002/DerivedGen.idr b/tests/derivation/infra/ext print 002/DerivedGen.idr
index c47dace79..148b3f55d 100644
--- a/tests/derivation/infra/ext print 002/DerivedGen.idr	
+++ b/tests/derivation/infra/ext print 002/DerivedGen.idr	
@@ -1,10 +1,12 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{Ext_XSS} $ Fuel -> (Fuel -> Gen MaybeEmpty String) => Gen MaybeEmpty XSS
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{Ext_XSS} $ Fuel -> (Fuel -> Gen MaybeEmpty String) => Gen MaybeEmpty XSS
diff --git a/tests/derivation/infra/ext print 002/PrintDerivation.idr b/tests/derivation/infra/ext print 002/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/ext print 002/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/ext print 002/expected b/tests/derivation/infra/ext print 002/expected
index f52a73ec8..a3a92d2fa 100644
--- a/tests/derivation/infra/ext print 002/expected	
+++ b/tests/derivation/infra/ext print 002/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> Gen MaybeEmpty XSS
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> Gen MaybeEmpty XSS
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/infra/ext print 003/DerivedGen.idr b/tests/derivation/infra/ext print 003/DerivedGen.idr
index 01c6d254e..fda59fadd 100644
--- a/tests/derivation/infra/ext print 003/DerivedGen.idr	
+++ b/tests/derivation/infra/ext print 003/DerivedGen.idr	
@@ -1,10 +1,12 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{Ext_XSN} $ Fuel -> (Fuel -> Gen MaybeEmpty String) => (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty XSN
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{Ext_XSN} $ Fuel -> (Fuel -> Gen MaybeEmpty String) => (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty XSN
diff --git a/tests/derivation/infra/ext print 003/PrintDerivation.idr b/tests/derivation/infra/ext print 003/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/ext print 003/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/ext print 003/expected b/tests/derivation/infra/ext print 003/expected
index 3cdfcabcc..0baee2ef8 100644
--- a/tests/derivation/infra/ext print 003/expected	
+++ b/tests/derivation/infra/ext print 003/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty XSN
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty XSN
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/infra/ext print 004/DerivedGen.idr b/tests/derivation/infra/ext print 004/DerivedGen.idr
index 22e1d897d..09a192c96 100644
--- a/tests/derivation/infra/ext print 004/DerivedGen.idr	
+++ b/tests/derivation/infra/ext print 004/DerivedGen.idr	
@@ -1,10 +1,12 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{Ext_XSN} $ Fuel -> (Fuel -> Gen MaybeEmpty String) => (n : Nat) -> Gen MaybeEmpty (X'S n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{Ext_XSN} $ Fuel -> (Fuel -> Gen MaybeEmpty String) => (n : Nat) -> Gen MaybeEmpty (X'S n)
diff --git a/tests/derivation/infra/ext print 004/PrintDerivation.idr b/tests/derivation/infra/ext print 004/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/ext print 004/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/ext print 004/expected b/tests/derivation/infra/ext print 004/expected
index e384a2bef..138a41b86 100644
--- a/tests/derivation/infra/ext print 004/expected	
+++ b/tests/derivation/infra/ext print 004/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> (n : Nat) -> Gen MaybeEmpty (X'S n)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> (n : Nat) -> Gen MaybeEmpty (X'S n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/infra/ext run 001/DerivedGen.idr b/tests/derivation/infra/ext run 001/DerivedGen.idr
index ea7e76e15..cf18ef03d 100644
--- a/tests/derivation/infra/ext run 001/DerivedGen.idr	
+++ b/tests/derivation/infra/ext run 001/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/ext run 002/DerivedGen.idr b/tests/derivation/infra/ext run 002/DerivedGen.idr
index 96d26d729..a09ecae63 100644
--- a/tests/derivation/infra/ext run 002/DerivedGen.idr	
+++ b/tests/derivation/infra/ext run 002/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/ext run 003/DerivedGen.idr b/tests/derivation/infra/ext run 003/DerivedGen.idr
index 4e067ab1b..2be2eedd7 100644
--- a/tests/derivation/infra/ext run 003/DerivedGen.idr	
+++ b/tests/derivation/infra/ext run 003/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/ext run 004/DerivedGen.idr b/tests/derivation/infra/ext run 004/DerivedGen.idr
index 378e9fbb5..cb971e6f7 100644
--- a/tests/derivation/infra/ext run 004/DerivedGen.idr	
+++ b/tests/derivation/infra/ext run 004/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/self print 001/DerivedGen.idr b/tests/derivation/infra/self print 001/DerivedGen.idr
index 0c9baa697..74cfd4ccc 100644
--- a/tests/derivation/infra/self print 001/DerivedGen.idr	
+++ b/tests/derivation/infra/self print 001/DerivedGen.idr	
@@ -1,10 +1,12 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{CallSelf} $ Fuel -> Gen MaybeEmpty Unit
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{CallSelf} $ Fuel -> Gen MaybeEmpty Unit
diff --git a/tests/derivation/infra/self print 001/PrintDerivation.idr b/tests/derivation/infra/self print 001/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/self print 001/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/self print 001/expected b/tests/derivation/infra/self print 001/expected
index ec9969db1..e02a7a623 100644
--- a/tests/derivation/infra/self print 001/expected	
+++ b/tests/derivation/infra/self print 001/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty ()
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty ()
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/self print 002/DerivedGen.idr b/tests/derivation/infra/self print 002/DerivedGen.idr
index 4fe3908a3..088a2f4ad 100644
--- a/tests/derivation/infra/self print 002/DerivedGen.idr	
+++ b/tests/derivation/infra/self print 002/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{CallSelf} $ Fuel -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{CallSelf} $ Fuel -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
diff --git a/tests/derivation/infra/self print 002/PrintDerivation.idr b/tests/derivation/infra/self print 002/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/self print 002/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/self print 002/expected b/tests/derivation/infra/self print 002/expected
index 684ee508a..8345715d5 100644
--- a/tests/derivation/infra/self print 002/expected	
+++ b/tests/derivation/infra/self print 002/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> (a : Type) -> Gen MaybeEmpty (Vect n a)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
diff --git a/tests/derivation/infra/self print 003/DerivedGen.idr b/tests/derivation/infra/self print 003/DerivedGen.idr
index 41333be59..56c2426f5 100644
--- a/tests/derivation/infra/self print 003/DerivedGen.idr	
+++ b/tests/derivation/infra/self print 003/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{CallSelf} $ Fuel -> (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty Bool
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{CallSelf} $ Fuel -> (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty Bool
diff --git a/tests/derivation/infra/self print 003/PrintDerivation.idr b/tests/derivation/infra/self print 003/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/self print 003/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/self print 003/expected b/tests/derivation/infra/self print 003/expected
index 746ea7868..866795299 100644
--- a/tests/derivation/infra/self print 003/expected	
+++ b/tests/derivation/infra/self print 003/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty Bool
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty Bool
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/infra/self print 004/DerivedGen.idr b/tests/derivation/infra/self print 004/DerivedGen.idr
index 9f091ccc6..4d6335d1a 100644
--- a/tests/derivation/infra/self print 004/DerivedGen.idr	
+++ b/tests/derivation/infra/self print 004/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +11,5 @@ import PrintDerivation
 data X : Nat -> Type where
   MkX : X n
 
-%runElab printDerived @{CallSelf} $ Fuel -> (n : Nat) -> Gen MaybeEmpty (X n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{CallSelf} $ Fuel -> (n : Nat) -> Gen MaybeEmpty (X n)
diff --git a/tests/derivation/infra/self print 004/PrintDerivation.idr b/tests/derivation/infra/self print 004/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/self print 004/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/self print 004/expected b/tests/derivation/infra/self print 004/expected
index 94958397d..95197b39a 100644
--- a/tests/derivation/infra/self print 004/expected	
+++ b/tests/derivation/infra/self print 004/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (X n)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (X n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> local
diff --git a/tests/derivation/infra/self print 005/DerivedGen.idr b/tests/derivation/infra/self print 005/DerivedGen.idr
index 6a31b5345..290552a25 100644
--- a/tests/derivation/infra/self print 005/DerivedGen.idr	
+++ b/tests/derivation/infra/self print 005/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +11,5 @@ import PrintDerivation
 data X : Nat -> Type where
   MkX : X n
 
-%runElab printDerived @{CallSelf} $ Fuel -> Gen MaybeEmpty (n : Nat ** X n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{CallSelf} $ Fuel -> Gen MaybeEmpty (n : Nat ** X n)
diff --git a/tests/derivation/infra/self print 005/PrintDerivation.idr b/tests/derivation/infra/self print 005/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/self print 005/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/self print 005/expected b/tests/derivation/infra/self print 005/expected
index 08f5edbab..499591456 100644
--- a/tests/derivation/infra/self print 005/expected	
+++ b/tests/derivation/infra/self print 005/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** X n)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** X n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/self print 006/DerivedGen.idr b/tests/derivation/infra/self print 006/DerivedGen.idr
index e4952ed19..21a7db324 100644
--- a/tests/derivation/infra/self print 006/DerivedGen.idr	
+++ b/tests/derivation/infra/self print 006/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{CallSelf} $ Fuel -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{CallSelf} $ Fuel -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
diff --git a/tests/derivation/infra/self print 006/PrintDerivation.idr b/tests/derivation/infra/self print 006/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/self print 006/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/self print 006/expected b/tests/derivation/infra/self print 006/expected
index be7aab0f6..99a721fa5 100644
--- a/tests/derivation/infra/self print 006/expected	
+++ b/tests/derivation/infra/self print 006/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Type) -> Gen MaybeEmpty (n : Nat ** Vect n a)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> local
diff --git a/tests/derivation/infra/self print 007/DerivedGen.idr b/tests/derivation/infra/self print 007/DerivedGen.idr
index 1a09914a4..1d14c2c68 100644
--- a/tests/derivation/infra/self print 007/DerivedGen.idr	
+++ b/tests/derivation/infra/self print 007/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +12,5 @@ data X : Nat -> Bool -> Type where
   X0 : X 0 True
   X1 : X 1 False
 
-%runElab printDerived @{CallSelf} $ Fuel -> Gen MaybeEmpty (n : Nat ** b : Bool ** X n b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{CallSelf} $ Fuel -> Gen MaybeEmpty (n : Nat ** b : Bool ** X n b)
diff --git a/tests/derivation/infra/self print 007/PrintDerivation.idr b/tests/derivation/infra/self print 007/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/self print 007/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/self print 007/expected b/tests/derivation/infra/self print 007/expected
index b08bc1fa5..2db67de0a 100644
--- a/tests/derivation/infra/self print 007/expected	
+++ b/tests/derivation/infra/self print 007/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (b : Bool ** X n b))
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (b : Bool ** X n b))
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/self print 008/DerivedGen.idr b/tests/derivation/infra/self print 008/DerivedGen.idr
index 58cc37b76..aea37b3bd 100644
--- a/tests/derivation/infra/self print 008/DerivedGen.idr	
+++ b/tests/derivation/infra/self print 008/DerivedGen.idr	
@@ -1,7 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
-import PrintDerivation
+
+import Deriving.DepTyCheck.Gen
 
 import Data.Vect
 
@@ -9,4 +10,5 @@ import Data.Vect
 
 %language ElabReflection
 
-%runElab printDerived @{CallSelf} $ Fuel -> Gen MaybeEmpty (n : Nat ** a : Type ** Vect n a)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{CallSelf} $ Fuel -> Gen MaybeEmpty (n : Nat ** a : Type ** Vect n a)
diff --git a/tests/derivation/infra/self print 008/PrintDerivation.idr b/tests/derivation/infra/self print 008/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/infra/self print 008/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/infra/self print 008/expected b/tests/derivation/infra/self print 008/expected
index 4864ed647..632e63eed 100644
--- a/tests/derivation/infra/self print 008/expected	
+++ b/tests/derivation/infra/self print 008/expected	
@@ -1,8 +1,6 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (a : Type ** Vect n a))
-LOG gen.auto.derive.infra:0: 
+1/2: Building AlternativeCore (AlternativeCore.idr)
+2/2: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** (a : Type ** Vect n a))
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/infra/self run 001/DerivedGen.idr b/tests/derivation/infra/self run 001/DerivedGen.idr
index f927ee5de..694a37387 100644
--- a/tests/derivation/infra/self run 001/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 001/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/self run 002/DerivedGen.idr b/tests/derivation/infra/self run 002/DerivedGen.idr
index c306187fb..a8e0cac23 100644
--- a/tests/derivation/infra/self run 002/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 002/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/self run 003/DerivedGen.idr b/tests/derivation/infra/self run 003/DerivedGen.idr
index 33bfa8535..471f180b5 100644
--- a/tests/derivation/infra/self run 003/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 003/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/self run 004/DerivedGen.idr b/tests/derivation/infra/self run 004/DerivedGen.idr
index cdc0a73ef..ecb4649a2 100644
--- a/tests/derivation/infra/self run 004/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 004/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/self run 005/DerivedGen.idr b/tests/derivation/infra/self run 005/DerivedGen.idr
index e0255dd82..483e69d51 100644
--- a/tests/derivation/infra/self run 005/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 005/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/self run 006/DerivedGen.idr b/tests/derivation/infra/self run 006/DerivedGen.idr
index 0ec6ac988..abb29f24a 100644
--- a/tests/derivation/infra/self run 006/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 006/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 %default total
diff --git a/tests/derivation/infra/self run 007/DerivedGen.idr b/tests/derivation/infra/self run 007/DerivedGen.idr
index 34780b198..ab9c7e2cc 100644
--- a/tests/derivation/infra/self run 007/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 007/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/self run 008/DerivedGen.idr b/tests/derivation/infra/self run 008/DerivedGen.idr
index ae584810e..4bb3af350 100644
--- a/tests/derivation/infra/self run 008/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 008/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/self run 009/DerivedGen.idr b/tests/derivation/infra/self run 009/DerivedGen.idr
index 9b93eb3df..4b91b4388 100644
--- a/tests/derivation/infra/self run 009/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 009/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/infra/self run 010/DerivedGen.idr b/tests/derivation/infra/self run 010/DerivedGen.idr
index 68cc8b0b2..eef405f0f 100644
--- a/tests/derivation/infra/self run 010/DerivedGen.idr	
+++ b/tests/derivation/infra/self run 010/DerivedGen.idr	
@@ -1,6 +1,8 @@
 module DerivedGen
 
 import AlternativeCore
+
+import Deriving.DepTyCheck.Gen
 import RunDerivedGen
 
 import Data.Vect
diff --git a/tests/derivation/least-effort/print/adt/001 trivial/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/001 trivial/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/001 trivial/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/001 trivial/DerivedGen.idr b/tests/derivation/least-effort/print/adt/001 trivial/DerivedGen.idr
index 202e0e384..d438f61f6 100644
--- a/tests/derivation/least-effort/print/adt/001 trivial/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/001 trivial/DerivedGen.idr	
@@ -1,10 +1,10 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Unit
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Unit
diff --git a/tests/derivation/least-effort/print/adt/001 trivial/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/001 trivial/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/001 trivial/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/001 trivial/expected b/tests/derivation/least-effort/print/adt/001 trivial/expected
index 7c643cfb9..fdf376616 100644
--- a/tests/derivation/least-effort/print/adt/001 trivial/expected	
+++ b/tests/derivation/least-effort/print/adt/001 trivial/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty ()
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty ()
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/002 noparam/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/002 noparam/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/002 noparam/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/002 noparam/DerivedGen.idr b/tests/derivation/least-effort/print/adt/002 noparam/DerivedGen.idr
index bd5f16e26..eb266dfee 100644
--- a/tests/derivation/least-effort/print/adt/002 noparam/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/002 noparam/DerivedGen.idr	
@@ -1,10 +1,10 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Bool
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Bool
diff --git a/tests/derivation/least-effort/print/adt/002 noparam/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/002 noparam/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/002 noparam/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/002 noparam/expected b/tests/derivation/least-effort/print/adt/002 noparam/expected
index ef8b124d3..830ea4f10 100644
--- a/tests/derivation/least-effort/print/adt/002 noparam/expected	
+++ b/tests/derivation/least-effort/print/adt/002 noparam/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Bool
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Bool
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/003 noparam/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/003 noparam/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/003 noparam/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/003 noparam/DerivedGen.idr b/tests/derivation/least-effort/print/adt/003 noparam/DerivedGen.idr
index a8fe4be13..d0e80e601 100644
--- a/tests/derivation/least-effort/print/adt/003 noparam/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/003 noparam/DerivedGen.idr	
@@ -1,10 +1,10 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Nat
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Nat
diff --git a/tests/derivation/least-effort/print/adt/003 noparam/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/003 noparam/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/003 noparam/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/003 noparam/expected b/tests/derivation/least-effort/print/adt/003 noparam/expected
index a8897149b..6d91ede24 100644
--- a/tests/derivation/least-effort/print/adt/003 noparam/expected	
+++ b/tests/derivation/least-effort/print/adt/003 noparam/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Nat
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Nat
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/004 noparam/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/004 noparam/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/004 noparam/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/004 noparam/DerivedGen.idr b/tests/derivation/least-effort/print/adt/004 noparam/DerivedGen.idr
index c2e5893ec..7fdeb9fae 100644
--- a/tests/derivation/least-effort/print/adt/004 noparam/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/004 noparam/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +10,5 @@ data X : Type where
   E : X
   R : X -> Nat -> X
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty X
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty X
diff --git a/tests/derivation/least-effort/print/adt/004 noparam/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/004 noparam/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/004 noparam/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/004 noparam/expected b/tests/derivation/least-effort/print/adt/004 noparam/expected
index 6b7165e57..d1cf40ea6 100644
--- a/tests/derivation/least-effort/print/adt/004 noparam/expected	
+++ b/tests/derivation/least-effort/print/adt/004 noparam/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty X
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty X
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/005 param/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/005 param/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/005 param/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/005 param/DerivedGen.idr b/tests/derivation/least-effort/print/adt/005 param/DerivedGen.idr
index 91dfd05f6..280de2665 100644
--- a/tests/derivation/least-effort/print/adt/005 param/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/005 param/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +9,5 @@ import PrintDerivation
 data X : Nat -> Type where
   MkX : X n
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (n : Nat) -> Gen MaybeEmpty $ X n
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (n : Nat) -> Gen MaybeEmpty $ X n
diff --git a/tests/derivation/least-effort/print/adt/005 param/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/005 param/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/005 param/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/005 param/expected b/tests/derivation/least-effort/print/adt/005 param/expected
index 39c757998..535ba4e03 100644
--- a/tests/derivation/least-effort/print/adt/005 param/expected	
+++ b/tests/derivation/least-effort/print/adt/005 param/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (X n)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (X n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> local
diff --git a/tests/derivation/least-effort/print/adt/006 param/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/006 param/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/006 param/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/006 param/DerivedGen.idr b/tests/derivation/least-effort/print/adt/006 param/DerivedGen.idr
index ae23d2d01..6a8c898ca 100644
--- a/tests/derivation/least-effort/print/adt/006 param/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/006 param/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +9,5 @@ import PrintDerivation
 data X : Nat -> Type where
   MkX : X n
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty (n ** X n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty (n ** X n)
diff --git a/tests/derivation/least-effort/print/adt/006 param/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/006 param/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/006 param/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/006 param/expected b/tests/derivation/least-effort/print/adt/006 param/expected
index 590241e1b..7a6d17207 100644
--- a/tests/derivation/least-effort/print/adt/006 param/expected	
+++ b/tests/derivation/least-effort/print/adt/006 param/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** X n)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** X n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/007 right-to-left simple/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/007 right-to-left simple/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/007 right-to-left simple/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/007 right-to-left simple/DerivedGen.idr b/tests/derivation/least-effort/print/adt/007 right-to-left simple/DerivedGen.idr
index 88d9b7390..a470d2c59 100644
--- a/tests/derivation/least-effort/print/adt/007 right-to-left simple/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/007 right-to-left simple/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -13,4 +12,5 @@ data X : Nat -> Type where
 data Y : Type where
   MkY : {n : _} -> X n -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/adt/007 right-to-left simple/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/007 right-to-left simple/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/007 right-to-left simple/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/007 right-to-left simple/expected b/tests/derivation/least-effort/print/adt/007 right-to-left simple/expected
index 99902817d..c64626f3e 100644
--- a/tests/derivation/least-effort/print/adt/007 right-to-left simple/expected	
+++ b/tests/derivation/least-effort/print/adt/007 right-to-left simple/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/008 right-to-left simple/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/008 right-to-left simple/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/008 right-to-left simple/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/008 right-to-left simple/DerivedGen.idr b/tests/derivation/least-effort/print/adt/008 right-to-left simple/DerivedGen.idr
index 5101f0ed9..f89c53349 100644
--- a/tests/derivation/least-effort/print/adt/008 right-to-left simple/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/008 right-to-left simple/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -13,4 +12,5 @@ data X : Nat -> Type where
 data Y : Type where
   MkY : X n -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/adt/008 right-to-left simple/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/008 right-to-left simple/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/008 right-to-left simple/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/008 right-to-left simple/expected b/tests/derivation/least-effort/print/adt/008 right-to-left simple/expected
index 99902817d..c64626f3e 100644
--- a/tests/derivation/least-effort/print/adt/008 right-to-left simple/expected	
+++ b/tests/derivation/least-effort/print/adt/008 right-to-left simple/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/009 left-to-right/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/009 left-to-right/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/009 left-to-right/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/009 left-to-right/DerivedGen.idr b/tests/derivation/least-effort/print/adt/009 left-to-right/DerivedGen.idr
index 1ad7b0be4..13e836ca4 100644
--- a/tests/derivation/least-effort/print/adt/009 left-to-right/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/009 left-to-right/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -13,4 +12,5 @@ data X : Nat -> Type where
 data Y : Type where
   MkY : {n : _} -> X (n * 2) -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/adt/009 left-to-right/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/009 left-to-right/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/009 left-to-right/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/009 left-to-right/expected b/tests/derivation/least-effort/print/adt/009 left-to-right/expected
index 73df6e27f..3bf59fae0 100644
--- a/tests/derivation/least-effort/print/adt/009 left-to-right/expected	
+++ b/tests/derivation/least-effort/print/adt/009 left-to-right/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/DerivedGen.idr b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/DerivedGen.idr
index 9952f7c21..b91ee3ecc 100644
--- a/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -13,4 +12,5 @@ data X : Nat -> Nat -> Type where
 data Y : Type where
   MkY : X n m -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/expected b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/expected
index e71b4834e..28b3d7ab2 100644
--- a/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/expected	
+++ b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/DerivedGen.idr b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/DerivedGen.idr
index bf720fef4..5d22026f1 100644
--- a/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -13,4 +12,5 @@ data X : Nat -> Unit -> Type where
 data Y : Type where
   MkY : X n m -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/expected b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/expected
index 0c547800c..4d56d2a43 100644
--- a/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/expected	
+++ b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/012 right-to-left chained/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/012 right-to-left chained/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/012 right-to-left chained/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/012 right-to-left chained/DerivedGen.idr b/tests/derivation/least-effort/print/adt/012 right-to-left chained/DerivedGen.idr
index f4a3c8c65..5d4d9c1f5 100644
--- a/tests/derivation/least-effort/print/adt/012 right-to-left chained/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/012 right-to-left chained/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -16,4 +15,5 @@ data X2 : Nat -> Type where
 data Y : Type where
   MkY : X2 n -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/adt/012 right-to-left chained/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/012 right-to-left chained/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/012 right-to-left chained/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/012 right-to-left chained/expected b/tests/derivation/least-effort/print/adt/012 right-to-left chained/expected
index 9ce8de8b5..b1111e603 100644
--- a/tests/derivation/least-effort/print/adt/012 right-to-left chained/expected	
+++ b/tests/derivation/least-effort/print/adt/012 right-to-left chained/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/013 right-to-left nondet/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/013 right-to-left nondet/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/013 right-to-left nondet/DerivedGen.idr b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/DerivedGen.idr
index 40597e555..c7f1c7ac1 100644
--- a/tests/derivation/least-effort/print/adt/013 right-to-left nondet/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -13,4 +12,5 @@ data X : Nat -> Nat -> Type where
 data Y : Type where
   MkY : X n m -> X n k -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/adt/013 right-to-left nondet/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/013 right-to-left nondet/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/013 right-to-left nondet/expected b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/expected
index b7ecd7eb4..1c7187032 100644
--- a/tests/derivation/least-effort/print/adt/013 right-to-left nondet/expected	
+++ b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/DerivedGen.idr b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/DerivedGen.idr
index e85864bb9..74b70321f 100644
--- a/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -13,4 +12,6 @@ data X : String -> Nat -> Type where
 data Y : Type where
   MkY : X n m -> X n k -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (Fuel -> Gen MaybeEmpty String) => (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $
+  Fuel -> (Fuel -> Gen MaybeEmpty String) => (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/expected b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/expected
index d2d217c37..1665558d9 100644
--- a/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/expected	
+++ b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/least-effort/print/gadt/001 gadt/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/001 gadt/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/001 gadt/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/001 gadt/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/001 gadt/DerivedGen.idr
index 40d0b0b29..54948df97 100644
--- a/tests/derivation/least-effort/print/gadt/001 gadt/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/001 gadt/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 import Data.Fin
 
@@ -9,4 +8,5 @@ import Data.Fin
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (n : Nat) -> Gen MaybeEmpty $ Fin n
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (n : Nat) -> Gen MaybeEmpty $ Fin n
diff --git a/tests/derivation/least-effort/print/gadt/001 gadt/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/001 gadt/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/001 gadt/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/001 gadt/expected b/tests/derivation/least-effort/print/gadt/001 gadt/expected
index b25b5018c..130d020b3 100644
--- a/tests/derivation/least-effort/print/gadt/001 gadt/expected	
+++ b/tests/derivation/least-effort/print/gadt/001 gadt/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (Fin n)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> Gen MaybeEmpty (Fin n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> local
diff --git a/tests/derivation/least-effort/print/gadt/002 gadt/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/002 gadt/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/002 gadt/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/002 gadt/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/002 gadt/DerivedGen.idr
index f004bc480..45fe04ce8 100644
--- a/tests/derivation/least-effort/print/gadt/002 gadt/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/002 gadt/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 import Data.Fin
 
@@ -9,4 +8,5 @@ import Data.Fin
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty (n ** Fin n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty (n ** Fin n)
diff --git a/tests/derivation/least-effort/print/gadt/002 gadt/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/002 gadt/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/002 gadt/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/002 gadt/expected b/tests/derivation/least-effort/print/gadt/002 gadt/expected
index ebe5d06df..0bfb458f5 100644
--- a/tests/derivation/least-effort/print/gadt/002 gadt/expected	
+++ b/tests/derivation/least-effort/print/gadt/002 gadt/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** Fin n)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** Fin n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/DerivedGen.idr
index eb6cf7aea..713405d71 100644
--- a/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -15,4 +14,5 @@ data Y : Type where
   MkY1 : X_GADT n m -> X_GADT n k -> Y
   MkY2 : X_GADT n m -> X_GADT k m -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/expected b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/expected
index b4d6bc272..66e220888 100644
--- a/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/expected	
+++ b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/gadt/004 right-to-left det/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/004 right-to-left det/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/004 right-to-left det/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/004 right-to-left det/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/004 right-to-left det/DerivedGen.idr
index f305bb514..8e0d6746d 100644
--- a/tests/derivation/least-effort/print/gadt/004 right-to-left det/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/004 right-to-left det/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -20,4 +19,5 @@ data Y : Type where
   -- Should be generated right-to-left because of GADT on the right
   MkY_RL : X_ADT n m -> X_GADT n k -> Y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty Y
diff --git a/tests/derivation/least-effort/print/gadt/004 right-to-left det/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/004 right-to-left det/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/004 right-to-left det/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/004 right-to-left det/expected b/tests/derivation/least-effort/print/gadt/004 right-to-left det/expected
index da000ae97..90eac771c 100644
--- a/tests/derivation/least-effort/print/gadt/004 right-to-left det/expected	
+++ b/tests/derivation/least-effort/print/gadt/004 right-to-left det/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty Y
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty Y
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/gadt/005 gadt/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/005 gadt/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/005 gadt/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/005 gadt/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/005 gadt/DerivedGen.idr
index 0d0f8a64f..34daa1aed 100644
--- a/tests/derivation/least-effort/print/gadt/005 gadt/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/005 gadt/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -13,5 +12,6 @@ data D : Bool -> Type where
   TL : String ->        D True
   TR : String -> D b -> D True
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $
   Fuel -> (Fuel -> Gen MaybeEmpty Nat) => (Fuel -> Gen MaybeEmpty String) => Gen MaybeEmpty (b ** D b)
diff --git a/tests/derivation/least-effort/print/gadt/005 gadt/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/005 gadt/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/005 gadt/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/005 gadt/expected b/tests/derivation/least-effort/print/gadt/005 gadt/expected
index 79fb99a1f..c36018d30 100644
--- a/tests/derivation/least-effort/print/gadt/005 gadt/expected	
+++ b/tests/derivation/least-effort/print/gadt/005 gadt/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> Gen MaybeEmpty (b : Bool ** D b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> Gen MaybeEmpty (b : Bool ** D b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/least-effort/print/gadt/006 gadt/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/006 gadt/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/006 gadt/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/006 gadt/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/006 gadt/DerivedGen.idr
index 87d0fde8e..9b3625fd3 100644
--- a/tests/derivation/least-effort/print/gadt/006 gadt/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/006 gadt/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -13,5 +12,6 @@ data D : Bool -> Type where
   TL : String ->        D True
   TR : String -> D b -> D True
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $
   Fuel -> (Fuel -> Gen MaybeEmpty Nat) => (Fuel -> Gen MaybeEmpty String) => (b : Bool) -> Gen MaybeEmpty $ D b
diff --git a/tests/derivation/least-effort/print/gadt/006 gadt/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/006 gadt/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/006 gadt/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/006 gadt/expected b/tests/derivation/least-effort/print/gadt/006 gadt/expected
index a0afbd896..69dbcaa47 100644
--- a/tests/derivation/least-effort/print/gadt/006 gadt/expected	
+++ b/tests/derivation/least-effort/print/gadt/006 gadt/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> (b : Bool) -> Gen MaybeEmpty (D b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty String)} -> (b : Bool) -> Gen MaybeEmpty (D b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/least-effort/print/gadt/007 eq-n/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/007 eq-n/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/007 eq-n/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/007 eq-n/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/007 eq-n/DerivedGen.idr
index c56ce79eb..814d0d989 100644
--- a/tests/derivation/least-effort/print/gadt/007 eq-n/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/007 eq-n/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +9,5 @@ import PrintDerivation
 data EqualN : Nat -> Nat -> Type where
   ReflN : EqualN x x
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty (a ** b ** EqualN a b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty (a ** b ** EqualN a b)
diff --git a/tests/derivation/least-effort/print/gadt/007 eq-n/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/007 eq-n/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/007 eq-n/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/007 eq-n/expected b/tests/derivation/least-effort/print/gadt/007 eq-n/expected
index 4a2c5d0d4..29fea41fc 100644
--- a/tests/derivation/least-effort/print/gadt/007 eq-n/expected	
+++ b/tests/derivation/least-effort/print/gadt/007 eq-n/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (a : Nat ** (b : Nat ** EqualN a b))
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (a : Nat ** (b : Nat ** EqualN a b))
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/gadt/008 eq-n/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/008 eq-n/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/008 eq-n/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/008 eq-n/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/008 eq-n/DerivedGen.idr
index 0b0431fca..bfdde2106 100644
--- a/tests/derivation/least-effort/print/gadt/008 eq-n/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/008 eq-n/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +9,5 @@ import PrintDerivation
 data EqualN : Nat -> Nat -> Type where
   ReflN : EqualN x x
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Nat) -> Gen MaybeEmpty (b ** EqualN a b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Nat) -> Gen MaybeEmpty (b ** EqualN a b)
diff --git a/tests/derivation/least-effort/print/gadt/008 eq-n/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/008 eq-n/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/008 eq-n/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/008 eq-n/expected b/tests/derivation/least-effort/print/gadt/008 eq-n/expected
index c09dcbce9..3264f7fdf 100644
--- a/tests/derivation/least-effort/print/gadt/008 eq-n/expected	
+++ b/tests/derivation/least-effort/print/gadt/008 eq-n/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Nat) -> Gen MaybeEmpty (b : Nat ** EqualN a b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Nat) -> Gen MaybeEmpty (b : Nat ** EqualN a b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> local
diff --git a/tests/derivation/least-effort/print/gadt/009 eq-n/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/009 eq-n/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/009 eq-n/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/009 eq-n/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/009 eq-n/DerivedGen.idr
index 2bd218a02..ac62817a9 100644
--- a/tests/derivation/least-effort/print/gadt/009 eq-n/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/009 eq-n/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +9,5 @@ import PrintDerivation
 data EqualN : Nat -> Nat -> Type where
   ReflN : EqualN x x
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (b : Nat) -> Gen MaybeEmpty (a ** EqualN a b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (b : Nat) -> Gen MaybeEmpty (a ** EqualN a b)
diff --git a/tests/derivation/least-effort/print/gadt/009 eq-n/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/009 eq-n/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/009 eq-n/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/009 eq-n/expected b/tests/derivation/least-effort/print/gadt/009 eq-n/expected
index 4bea3639d..fa8d8cf51 100644
--- a/tests/derivation/least-effort/print/gadt/009 eq-n/expected	
+++ b/tests/derivation/least-effort/print/gadt/009 eq-n/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (b : Nat) -> Gen MaybeEmpty (a : Nat ** EqualN a b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (b : Nat) -> Gen MaybeEmpty (a : Nat ** EqualN a b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<b>") implicitTrue
 .=> local
diff --git a/tests/derivation/least-effort/print/gadt/010 eq-n/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/010 eq-n/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/010 eq-n/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/010 eq-n/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/010 eq-n/DerivedGen.idr
index 156e74605..512f66652 100644
--- a/tests/derivation/least-effort/print/gadt/010 eq-n/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/010 eq-n/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +9,5 @@ import PrintDerivation
 data EqualN : Nat -> Nat -> Type where
   ReflN : EqualN x x
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a, b : Nat) -> Gen MaybeEmpty $ EqualN a b
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a, b : Nat) -> Gen MaybeEmpty $ EqualN a b
diff --git a/tests/derivation/least-effort/print/gadt/010 eq-n/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/010 eq-n/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/010 eq-n/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/010 eq-n/expected b/tests/derivation/least-effort/print/gadt/010 eq-n/expected
index 5004a4d81..f712dd332 100644
--- a/tests/derivation/least-effort/print/gadt/010 eq-n/expected	
+++ b/tests/derivation/least-effort/print/gadt/010 eq-n/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Nat) -> (b : Nat) -> Gen MaybeEmpty (EqualN a b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Nat) -> (b : Nat) -> Gen MaybeEmpty (EqualN a b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<b>") implicitTrue
diff --git a/tests/derivation/least-effort/print/gadt/011 eq deepcons/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/011 eq deepcons/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/011 eq deepcons/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/011 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/011 eq deepcons/DerivedGen.idr
index 39abcaed4..41a64330d 100644
--- a/tests/derivation/least-effort/print/gadt/011 eq deepcons/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/011 eq deepcons/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +10,5 @@ data LT2 : Nat -> Nat -> Type where
   Base : x `LT2` S (S x)
   Step : x `LT2` y -> x `LT2` S y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty (a ** b ** LT2 a b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (Fuel -> Gen MaybeEmpty Nat) => Gen MaybeEmpty (a ** b ** LT2 a b)
diff --git a/tests/derivation/least-effort/print/gadt/011 eq deepcons/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/011 eq deepcons/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/011 eq deepcons/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/011 eq deepcons/expected b/tests/derivation/least-effort/print/gadt/011 eq deepcons/expected
index 91ef4015d..192fc7b89 100644
--- a/tests/derivation/least-effort/print/gadt/011 eq deepcons/expected	
+++ b/tests/derivation/least-effort/print/gadt/011 eq deepcons/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty (a : Nat ** (b : Nat ** LT2 a b))
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> {auto conArg : ((arg : Fuel) -> Gen MaybeEmpty Nat)} -> Gen MaybeEmpty (a : Nat ** (b : Nat ** LT2 a b))
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg
       MW
diff --git a/tests/derivation/least-effort/print/gadt/012 eq deepcons/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/012 eq deepcons/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/012 eq deepcons/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/012 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/012 eq deepcons/DerivedGen.idr
index d21093527..3afc9b6f6 100644
--- a/tests/derivation/least-effort/print/gadt/012 eq deepcons/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/012 eq deepcons/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +10,5 @@ data LT2 : Nat -> Nat -> Type where
   Base : x `LT2` S (S x)
   Step : x `LT2` y -> x `LT2` S y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Nat) -> Gen MaybeEmpty (b ** LT2 a b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Nat) -> Gen MaybeEmpty (b ** LT2 a b)
diff --git a/tests/derivation/least-effort/print/gadt/012 eq deepcons/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/012 eq deepcons/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/012 eq deepcons/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/012 eq deepcons/expected b/tests/derivation/least-effort/print/gadt/012 eq deepcons/expected
index 5003f3937..d18fbf2e2 100644
--- a/tests/derivation/least-effort/print/gadt/012 eq deepcons/expected	
+++ b/tests/derivation/least-effort/print/gadt/012 eq deepcons/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Nat) -> Gen MaybeEmpty (b : Nat ** LT2 a b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Nat) -> Gen MaybeEmpty (b : Nat ** LT2 a b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> local
diff --git a/tests/derivation/least-effort/print/gadt/013 eq deepcons/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/013 eq deepcons/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/013 eq deepcons/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/013 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/013 eq deepcons/DerivedGen.idr
index c3106bd02..f36073edc 100644
--- a/tests/derivation/least-effort/print/gadt/013 eq deepcons/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/013 eq deepcons/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +10,5 @@ data LT2 : Nat -> Nat -> Type where
   Base : x `LT2` S (S x)
   Step : x `LT2` y -> x `LT2` S y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (b : Nat) -> Gen MaybeEmpty (a ** LT2 a b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (b : Nat) -> Gen MaybeEmpty (a ** LT2 a b)
diff --git a/tests/derivation/least-effort/print/gadt/013 eq deepcons/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/013 eq deepcons/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/013 eq deepcons/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/013 eq deepcons/expected b/tests/derivation/least-effort/print/gadt/013 eq deepcons/expected
index 1fafeefe4..3f1bec753 100644
--- a/tests/derivation/least-effort/print/gadt/013 eq deepcons/expected	
+++ b/tests/derivation/least-effort/print/gadt/013 eq deepcons/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (b : Nat) -> Gen MaybeEmpty (a : Nat ** LT2 a b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (b : Nat) -> Gen MaybeEmpty (a : Nat ** LT2 a b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<b>") implicitTrue
 .=> local
diff --git a/tests/derivation/least-effort/print/gadt/014 eq deepcons/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/014 eq deepcons/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/gadt/014 eq deepcons/AlternativeCore.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/014 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/014 eq deepcons/DerivedGen.idr
index d111b9eef..23510c2a9 100644
--- a/tests/derivation/least-effort/print/gadt/014 eq deepcons/DerivedGen.idr	
+++ b/tests/derivation/least-effort/print/gadt/014 eq deepcons/DerivedGen.idr	
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -11,4 +10,5 @@ data LT2 : Nat -> Nat -> Type where
   Base : x `LT2` S (S x)
   Step : x `LT2` y -> x `LT2` S y
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a, b : Nat) -> Gen MaybeEmpty $ LT2 a b
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a, b : Nat) -> Gen MaybeEmpty $ LT2 a b
diff --git a/tests/derivation/least-effort/print/gadt/014 eq deepcons/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/014 eq deepcons/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/gadt/014 eq deepcons/PrintDerivation.idr	
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/gadt/014 eq deepcons/expected b/tests/derivation/least-effort/print/gadt/014 eq deepcons/expected
index d85a8a75f..2e60bcf52 100644
--- a/tests/derivation/least-effort/print/gadt/014 eq deepcons/expected	
+++ b/tests/derivation/least-effort/print/gadt/014 eq deepcons/expected	
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Nat) -> (b : Nat) -> Gen MaybeEmpty (LT2 a b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Nat) -> (b : Nat) -> Gen MaybeEmpty (LT2 a b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<b>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-big/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/dependent-givens-big/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/dependent-givens-big/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-big/DerivedGen.idr b/tests/derivation/least-effort/print/regression/dependent-givens-big/DerivedGen.idr
index aeaf0b5b2..c8446e81a 100644
--- a/tests/derivation/least-effort/print/regression/dependent-givens-big/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/dependent-givens-big/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 import Data.Fin
 
@@ -63,4 +62,6 @@ namespace VectMaybeAnyType
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (n : Nat) -> (v : VectMaybeAnyType n) -> Gen MaybeEmpty (i ** t ** AtIndex n i t v)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $
+  Fuel -> (n : Nat) -> (v : VectMaybeAnyType n) -> Gen MaybeEmpty (i ** t ** AtIndex n i t v)
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-big/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/dependent-givens-big/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/dependent-givens-big/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-big/expected b/tests/derivation/least-effort/print/regression/dependent-givens-big/expected
index 3d6c7e79e..a144b90b0 100644
--- a/tests/derivation/least-effort/print/regression/dependent-givens-big/expected
+++ b/tests/derivation/least-effort/print/regression/dependent-givens-big/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> (v : VectMaybeAnyType n) -> Gen MaybeEmpty (i : Fin n ** (t : MaybeAnyType ** AtIndex n i t v))
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> (v : VectMaybeAnyType n) -> Gen MaybeEmpty (i : Fin n ** (t : MaybeAnyType ** AtIndex n i t v))
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<v>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/DerivedGen.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/DerivedGen.idr
index 192202848..3ccfbb61b 100644
--- a/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 import Data.Fin
 
@@ -12,4 +11,5 @@ data X : (n : Nat) -> Fin n -> Type where
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (n : Nat) -> (f : Fin n) -> Gen MaybeEmpty $ X n f
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (n : Nat) -> (f : Fin n) -> Gen MaybeEmpty $ X n f
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/expected b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/expected
index bd2c4785d..0d43d457f 100644
--- a/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/expected
+++ b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> (f : Fin n) -> Gen MaybeEmpty (X n f)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> (f : Fin n) -> Gen MaybeEmpty (X n f)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<f>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/DerivedGen.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/DerivedGen.idr
index f05d5adea..2ada959bc 100644
--- a/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 import Data.Fin
 
@@ -12,4 +11,5 @@ data X : (n : Nat) -> Fin n -> Type where
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (n : Nat) -> (f : Fin n) -> Gen MaybeEmpty $ X n f
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (n : Nat) -> (f : Fin n) -> Gen MaybeEmpty $ X n f
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/expected b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/expected
index d729941e8..12b4e1578 100644
--- a/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/expected
+++ b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (n : Nat) -> (f : Fin n) -> Gen MaybeEmpty (X n f)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (n : Nat) -> (f : Fin n) -> Gen MaybeEmpty (X n f)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<n>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<f>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/fin-inc/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/fin-inc/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/fin-inc/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/fin-inc/DerivedGen.idr b/tests/derivation/least-effort/print/regression/fin-inc/DerivedGen.idr
index a06aa8d8c..e8a337d19 100644
--- a/tests/derivation/least-effort/print/regression/fin-inc/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/fin-inc/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -12,4 +11,5 @@ record FinInc n where
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty (n ** FinInc n)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty (n ** FinInc n)
diff --git a/tests/derivation/least-effort/print/regression/fin-inc/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/fin-inc/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/fin-inc/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/fin-inc/expected b/tests/derivation/least-effort/print/regression/fin-inc/expected
index 6704d9098..c1f8a1dae 100644
--- a/tests/derivation/least-effort/print/regression/fin-inc/expected
+++ b/tests/derivation/least-effort/print/regression/fin-inc/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** FinInc n)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty (n : Nat ** FinInc n)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/DerivedGen.idr b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/DerivedGen.idr
index d14906920..478b79c08 100644
--- a/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,5 +9,6 @@ data X : Nat -> Nat -> Nat -> Nat -> Type where
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $
   Fuel -> (x1 : Nat) -> (x2 : Nat) -> (x3 : Nat) -> (x4 : Nat) -> Gen MaybeEmpty $ X x1 x2 x3 x4
diff --git a/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/expected b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/expected
index 5087bd90f..be2ffb8ef 100644
--- a/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/expected
+++ b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (x1 : Nat) -> (x2 : Nat) -> (x3 : Nat) -> (x4 : Nat) -> Gen MaybeEmpty (X x1 x2 x3 x4)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (x1 : Nat) -> (x2 : Nat) -> (x3 : Nat) -> (x4 : Nat) -> Gen MaybeEmpty (X x1 x2 x3 x4)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<x1>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<x2>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/DerivedGen.idr b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/DerivedGen.idr
index 829546dc0..da07fe1a9 100644
--- a/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -10,4 +9,5 @@ data X : Nat -> Nat -> Nat -> Type where
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (x1 : Nat) -> (x2 : Nat) -> (x3 : Nat) -> Gen MaybeEmpty $ X x1 x2 x3
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (x1 : Nat) -> (x2 : Nat) -> (x3 : Nat) -> Gen MaybeEmpty $ X x1 x2 x3
diff --git a/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/expected b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/expected
index 9cfd8a0a3..175310f8f 100644
--- a/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/expected
+++ b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (x1 : Nat) -> (x2 : Nat) -> (x3 : Nat) -> Gen MaybeEmpty (X x1 x2 x3)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (x1 : Nat) -> (x2 : Nat) -> (x3 : Nat) -> Gen MaybeEmpty (X x1 x2 x3)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<x1>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<x2>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/DerivedGen.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/DerivedGen.idr
index 206913aca..8d84e6c8c 100644
--- a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -22,4 +21,5 @@ data Z : Type where
 data W : Z -> Z -> Type where
   MkW : W (MkZ (MkX n False) (MkX m False)) (MkZ (MkX n True) (MkX m True))
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/expected b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/expected
index 0a6bfff91..982aa6d11 100644
--- a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/expected
+++ b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<b>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/DerivedGen.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/DerivedGen.idr
index 0bd71a53b..a67ef6e3a 100644
--- a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -21,4 +20,5 @@ data Z : Type where
 data W : Z -> Z -> Type where
   MkW : W (MkZ (MkX n m False)) (MkZ (MkX n m True))
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/expected b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/expected
index 9139e0be1..35aa68636 100644
--- a/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/expected
+++ b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<b>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/DerivedGen.idr b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/DerivedGen.idr
index 445a9e97c..1257fb467 100644
--- a/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -21,4 +20,5 @@ data Z : Type where
 data W : Z -> Z -> Type where
   MkW : W (MkZ (MkX n False)) (MkZ (MkX n True))
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/expected b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/expected
index 82c0d975e..450dadd17 100644
--- a/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/expected
+++ b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (a : Z) -> (b : Z) -> Gen MaybeEmpty (W a b)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<a>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<b>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/type-alias-gen-itself/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/type-alias-gen-itself/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/type-alias-gen-itself/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/type-alias-gen-itself/DerivedGen.idr b/tests/derivation/least-effort/print/regression/type-alias-gen-itself/DerivedGen.idr
index 589a997bd..db21871c2 100644
--- a/tests/derivation/least-effort/print/regression/type-alias-gen-itself/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/type-alias-gen-itself/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 import Data.Fin
 
@@ -12,4 +11,5 @@ X = Bool
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen0 X
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen0 X
diff --git a/tests/derivation/least-effort/print/regression/type-alias-gen-itself/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/type-alias-gen-itself/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/type-alias-gen-itself/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/type-alias-gen-itself/expected b/tests/derivation/least-effort/print/regression/type-alias-gen-itself/expected
index b4dcbbac2..b4bb77a57 100644
--- a/tests/derivation/least-effort/print/regression/type-alias-gen-itself/expected
+++ b/tests/derivation/least-effort/print/regression/type-alias-gen-itself/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen0 X
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen0 X
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/regression/type-alias-target-type/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/type-alias-target-type/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/type-alias-target-type/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/type-alias-target-type/DerivedGen.idr b/tests/derivation/least-effort/print/regression/type-alias-target-type/DerivedGen.idr
index fe36b6466..b6084031f 100644
--- a/tests/derivation/least-effort/print/regression/type-alias-target-type/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/type-alias-target-type/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 import Data.Fin
 
@@ -12,4 +11,5 @@ X = Bool
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty X
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> Gen MaybeEmpty X
diff --git a/tests/derivation/least-effort/print/regression/type-alias-target-type/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/type-alias-target-type/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/type-alias-target-type/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/type-alias-target-type/expected b/tests/derivation/least-effort/print/regression/type-alias-target-type/expected
index 1dccc08aa..44d95731a 100644
--- a/tests/derivation/least-effort/print/regression/type-alias-target-type/expected
+++ b/tests/derivation/least-effort/print/regression/type-alias-target-type/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> Gen MaybeEmpty X
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> Gen MaybeEmpty X
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> local
       { decls =
diff --git a/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/DerivedGen.idr b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/DerivedGen.idr
index a11564702..4897b4e85 100644
--- a/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 import Data.Fin
 
@@ -21,4 +20,5 @@ data Z : X -> X -> Type where
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (x : X) -> (x' : X) -> Gen MaybeEmpty $ Z x x'
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (x : X) -> (x' : X) -> Gen MaybeEmpty $ Z x x'
diff --git a/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/expected b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/expected
index dbb4089a9..f896d4019 100644
--- a/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/expected
+++ b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (x : X) -> (x' : X) -> Gen MaybeEmpty (Z x x')
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (x : X) -> (x' : X) -> Gen MaybeEmpty (Z x x')
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<x>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<x'>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/unification-name-mismatch/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/unification-name-mismatch/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/unification-name-mismatch/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/unification-name-mismatch/DerivedGen.idr b/tests/derivation/least-effort/print/regression/unification-name-mismatch/DerivedGen.idr
index 67cc352d7..b55eb2fa3 100644
--- a/tests/derivation/least-effort/print/regression/unification-name-mismatch/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/unification-name-mismatch/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 %default total
 
@@ -15,4 +14,5 @@ data Y : (xs : X) -> (ys : X) -> Type where
   A : Y (x :: xs) (x :: xs)
   B : Y xs ys -> Y (x :: xs) (y :: ys)
 
-%runElab printDerived $ Fuel -> (xs : X) -> (ys : X) -> Gen MaybeEmpty $ Y xs ys
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter $ Fuel -> (xs : X) -> (ys : X) -> Gen MaybeEmpty $ Y xs ys
diff --git a/tests/derivation/least-effort/print/regression/unification-name-mismatch/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/unification-name-mismatch/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/unification-name-mismatch/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/unification-name-mismatch/expected b/tests/derivation/least-effort/print/regression/unification-name-mismatch/expected
index a04fb2f71..051eda979 100644
--- a/tests/derivation/least-effort/print/regression/unification-name-mismatch/expected
+++ b/tests/derivation/least-effort/print/regression/unification-name-mismatch/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (xs : X) -> (ys : X) -> Gen MaybeEmpty (Y xs ys)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (xs : X) -> (ys : X) -> Gen MaybeEmpty (Y xs ys)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<xs>") implicitTrue
 .=> MkArg MW ExplicitArg (Just "outer^<ys>") implicitTrue
diff --git a/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/AlternativeCore.idr
deleted file mode 120000
index 6da8d83f9..000000000
--- a/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/AlternativeCore.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/AlternativeCore.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/DerivedGen.idr b/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/DerivedGen.idr
index 92a5ad3aa..dfd74e08f 100644
--- a/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/DerivedGen.idr
+++ b/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/DerivedGen.idr
@@ -1,7 +1,6 @@
 module DerivedGen
 
-import AlternativeCore
-import PrintDerivation
+import Deriving.DepTyCheck.Gen
 
 import Data.Fin
 
@@ -23,4 +22,5 @@ mutual
 
 %language ElabReflection
 
-%runElab printDerived @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (f : _) -> Gen MaybeEmpty (u ** Y u f)
+%logging "deptycheck.derive.print" 5
+%runElab deriveGenPrinter @{MainCoreDerivator @{LeastEffort}} $ Fuel -> (f : _) -> Gen MaybeEmpty (u ** Y u f)
diff --git a/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/PrintDerivation.idr
deleted file mode 120000
index 3724a195a..000000000
--- a/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/PrintDerivation.idr
+++ /dev/null
@@ -1 +0,0 @@
-../_common/PrintDerivation.idr
\ No newline at end of file
diff --git a/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/expected b/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/expected
index 56bac181e..e82c07f60 100644
--- a/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/expected
+++ b/tests/derivation/least-effort/print/regression/unnamed-auto-implicit/expected
@@ -1,8 +1,5 @@
-1/3: Building AlternativeCore (AlternativeCore.idr)
-2/3: Building PrintDerivation (PrintDerivation.idr)
-3/3: Building DerivedGen (DerivedGen.idr)
-LOG gen.auto.derive.infra:0: type: (arg : Fuel) -> (f : X) -> Gen MaybeEmpty (u : () ** Y u f)
-LOG gen.auto.derive.infra:0: 
+1/1: Building DerivedGen (DerivedGen.idr)
+LOG deptycheck.derive.print:5: type: (arg : Fuel) -> (f : X) -> Gen MaybeEmpty (u : () ** Y u f)
     MkArg MW ExplicitArg (Just "^outmost-fuel^") (var "Data.Fuel.Fuel")
 .=> MkArg MW ExplicitArg (Just "outer^<f>") implicitTrue
 .=> local
diff --git a/tests/derivation/utils/arg-deps/_common/Infra.idr b/tests/derivation/utils/arg-deps/_common/Infra.idr
index a10fc95d0..60a2c6129 100644
--- a/tests/derivation/utils/arg-deps/_common/Infra.idr
+++ b/tests/derivation/utils/arg-deps/_common/Infra.idr
@@ -14,7 +14,7 @@ ppTy ty = do
   let (args, ret) = unPi expr
   deps <- map SortedSet.toList <$> argDeps args
   let expr' = piAll ret $ {piInfo := ExplicitArg} <$> args -- as if all arguments were explicit
-  logSugaredTerm "gen.auto.arg-deps" 0 "type        " expr'
-  logMsg         "gen.auto.arg-deps" 0 "dependencies: \{show deps}\n"
+  logSugaredTerm "deptycheck.arg-deps" 0 "type        " expr'
+  logMsg         "deptycheck.arg-deps" 0 "dependencies: \{show deps}\n"
 
 %runElab for_ listToCheck ppTy
diff --git a/tests/derivation/utils/arg-deps/deps-001-simple/expected b/tests/derivation/utils/arg-deps/deps-001-simple/expected
index 8981a043b..0a7274ce4 100644
--- a/tests/derivation/utils/arg-deps/deps-001-simple/expected
+++ b/tests/derivation/utils/arg-deps/deps-001-simple/expected
@@ -1,14 +1,14 @@
 1/2: Building DepsCheck (DepsCheck.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.arg-deps:0: type        : ()
-LOG gen.auto.arg-deps:0: dependencies: []
+LOG deptycheck.arg-deps:0: type        : ()
+LOG deptycheck.arg-deps:0: dependencies: []
 
-LOG gen.auto.arg-deps:0: type        : (arg : Nat) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[]]
+LOG deptycheck.arg-deps:0: type        : (arg : Nat) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[]]
 
-LOG gen.auto.arg-deps:0: type        : (arg : Nat) -> (arg : Nat) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], []]
+LOG deptycheck.arg-deps:0: type        : (arg : Nat) -> (arg : Nat) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], []]
 
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (arg : List a) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [0]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (arg : List a) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [0]]
 
diff --git a/tests/derivation/utils/arg-deps/deps-002-longer-transitive/expected b/tests/derivation/utils/arg-deps/deps-002-longer-transitive/expected
index 7fbaa2cd3..de98fb058 100644
--- a/tests/derivation/utils/arg-deps/deps-002-longer-transitive/expected
+++ b/tests/derivation/utils/arg-deps/deps-002-longer-transitive/expected
@@ -1,29 +1,29 @@
 1/2: Building DepsCheck (DepsCheck.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.arg-deps:0: type        : (n : Nat) -> (a : Type) -> (arg : Vect n a) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [], [0, 1]]
+LOG deptycheck.arg-deps:0: type        : (n : Nat) -> (a : Type) -> (arg : Vect n a) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [], [0, 1]]
 
-LOG gen.auto.arg-deps:0: type        : (n : Nat) -> (a : Type) -> (v : Vect n a) -> (arg : length v = 5) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [], [0, 1], [0, 1, 2]]
+LOG deptycheck.arg-deps:0: type        : (n : Nat) -> (a : Type) -> (v : Vect n a) -> (arg : length v = 5) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [], [0, 1], [0, 1, 2]]
 
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (arg : Vect (length xs) a) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [0], [0, 1]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (arg : Vect (length xs) a) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [0], [0, 1]]
 
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (v : Vect (length xs) a) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [0], [0, 1]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (v : Vect (length xs) a) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [0], [0, 1]]
 
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (ys : List a) -> (arg : xs = ys) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [0], [0], [0, 1, 2]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (ys : List a) -> (arg : xs = ys) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [0], [0], [0, 1, 2]]
 
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (n : Nat) -> (m : Nat) -> (xs : Vect n a) -> (ys : Vect m a) -> (arg : xs = ys) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [], [], [0, 1], [0, 2], [0, 1, 2, 3, 4]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (n : Nat) -> (m : Nat) -> (xs : Vect n a) -> (ys : Vect m a) -> (arg : xs = ys) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [], [], [0, 1], [0, 2], [0, 1, 2, 3, 4]]
 
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (n : Nat) -> (m : Nat) -> (xs : Vect n a) -> (ys : Vect m a) -> (arg : xs = ys) -> (arg : List a) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [], [], [0, 1], [0, 2], [0, 1, 2, 3, 4], [0]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (n : Nat) -> (m : Nat) -> (xs : Vect n a) -> (ys : Vect m a) -> (arg : xs = ys) -> (arg : List a) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [], [], [0, 1], [0, 2], [0, 1, 2, 3, 4], [0]]
 
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (n : Nat) -> (m : Nat) -> (xs : Vect n a) -> (ys : Vect m a) -> (arg : xs = ys) -> (arg : xs = []) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [], [], [0, 1], [0, 2], [0, 1, 2, 3, 4], [0, 1, 3]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (n : Nat) -> (m : Nat) -> (xs : Vect n a) -> (ys : Vect m a) -> (arg : xs = ys) -> (arg : xs = []) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [], [], [0, 1], [0, 2], [0, 1, 2, 3, 4], [0, 1, 3]]
 
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (n : Nat) -> (m : Nat) -> (xs : Vect n a) -> (ys : Vect m a) -> (arg : xs = []) -> (arg : ys = []) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [], [], [0, 1], [0, 2], [0, 1, 3], [0, 2, 4]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (n : Nat) -> (m : Nat) -> (xs : Vect n a) -> (ys : Vect m a) -> (arg : xs = []) -> (arg : ys = []) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [], [], [0, 1], [0, 2], [0, 1, 3], [0, 2, 4]]
 
diff --git a/tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/expected b/tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/expected
index e1317455c..fb3bf4ce5 100644
--- a/tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/expected
+++ b/tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/expected
@@ -1,11 +1,11 @@
 1/2: Building DepsCheck (DepsCheck.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.arg-deps:0: type        : (x : Nat) -> (arg : \{x:0} => S {x:0} = S) -> ()
-LOG gen.auto.arg-deps:0: dependencies: [[], []]
+LOG deptycheck.arg-deps:0: type        : (x : Nat) -> (arg : \{x:0} => S {x:0} = S) -> ()
+LOG deptycheck.arg-deps:0: dependencies: [[], []]
 
-LOG gen.auto.arg-deps:0: type        : (x : Nat) -> (arg : \{x:0} => \{x:1} => S {x:1} = \{x:0} => S) -> ()
-LOG gen.auto.arg-deps:0: dependencies: [[], []]
+LOG deptycheck.arg-deps:0: type        : (x : Nat) -> (arg : \{x:0} => \{x:1} => S {x:1} = \{x:0} => S) -> ()
+LOG deptycheck.arg-deps:0: dependencies: [[], []]
 
-LOG gen.auto.arg-deps:0: type        : (x : Nat) -> (arg : \y => S y = S) -> ()
-LOG gen.auto.arg-deps:0: dependencies: [[], []]
+LOG deptycheck.arg-deps:0: type        : (x : Nat) -> (arg : \y => S y = S) -> ()
+LOG deptycheck.arg-deps:0: dependencies: [[], []]
 
diff --git a/tests/derivation/utils/arg-deps/deps-004-case/expected b/tests/derivation/utils/arg-deps/deps-004-case/expected
index 4d53cb966..41d31e3dc 100644
--- a/tests/derivation/utils/arg-deps/deps-004-case/expected
+++ b/tests/derivation/utils/arg-deps/deps-004-case/expected
@@ -1,8 +1,8 @@
 1/2: Building DepsCheck (DepsCheck.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (v : List a) -> (0 arg : case block in listToCheck a xs v) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [0], [0], [0, 2]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (v : List a) -> (0 arg : case block in listToCheck a xs v) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [0], [0], [0, 2]]
 
-LOG gen.auto.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (v : List a) -> (0 arg : case block in listToCheck a xs v) -> Nat
-LOG gen.auto.arg-deps:0: dependencies: [[], [0], [0], [0, 2]]
+LOG deptycheck.arg-deps:0: type        : (a : Type) -> (xs : List a) -> (v : List a) -> (0 arg : case block in listToCheck a xs v) -> Nat
+LOG deptycheck.arg-deps:0: dependencies: [[], [0], [0], [0, 2]]
 
diff --git a/tests/derivation/utils/canonicsig/_common/Infra.idr b/tests/derivation/utils/canonicsig/_common/Infra.idr
index 183e668e0..9fde9fb9c 100644
--- a/tests/derivation/utils/canonicsig/_common/Infra.idr
+++ b/tests/derivation/utils/canonicsig/_common/Infra.idr
@@ -40,7 +40,7 @@ caseVerdict (desc, given, expected) = do
 
 export
 logCheck : String -> Elab ()
-logCheck = \s => logMsg "gen.auto.canonic.check-sig" 0 s
+logCheck = \s => logMsg "deptycheck.canonic.check-sig" 0 s
 
 export
 checkAndLog : TestCaseDesc -> Elab ()
diff --git a/tests/derivation/utils/canonicsig/dep-params/expected b/tests/derivation/utils/canonicsig/dep-params/expected
index e37eeb869..bf57fd8db 100644
--- a/tests/derivation/utils/canonicsig/dep-params/expected
+++ b/tests/derivation/utils/canonicsig/dep-params/expected
@@ -1,8 +1,8 @@
 1/2: Building Infra (Infra.idr)
 2/2: Building CanonicSigCheck (CanonicSigCheck.idr)
-LOG gen.auto.canonic.check-sig:0: dependent type + mixed explicitness; all named; no givens:	OKAY
-LOG gen.auto.canonic.check-sig:0: dependent type + mixed explicitness; all named; no givens':	OKAY
-LOG gen.auto.canonic.check-sig:0: dependent type + mixed explicitness; all named; impl `a` given:	OKAY
-LOG gen.auto.canonic.check-sig:0: dependent type + mixed explicitness; all named; expl `n` given:	OKAY
-LOG gen.auto.canonic.check-sig:0: dependent type + mixed explicitness; all named; `a` and `n` given:	OKAY
-LOG gen.auto.canonic.check-sig:0: dependent type + mixed explicitness; all named; all given:	OKAY
+LOG deptycheck.canonic.check-sig:0: dependent type + mixed explicitness; all named; no givens:	OKAY
+LOG deptycheck.canonic.check-sig:0: dependent type + mixed explicitness; all named; no givens':	OKAY
+LOG deptycheck.canonic.check-sig:0: dependent type + mixed explicitness; all named; impl `a` given:	OKAY
+LOG deptycheck.canonic.check-sig:0: dependent type + mixed explicitness; all named; expl `n` given:	OKAY
+LOG deptycheck.canonic.check-sig:0: dependent type + mixed explicitness; all named; `a` and `n` given:	OKAY
+LOG deptycheck.canonic.check-sig:0: dependent type + mixed explicitness; all named; all given:	OKAY
diff --git a/tests/derivation/utils/canonicsig/nondep-expl-params/expected b/tests/derivation/utils/canonicsig/nondep-expl-params/expected
index c1d398135..dc1b7008d 100644
--- a/tests/derivation/utils/canonicsig/nondep-expl-params/expected
+++ b/tests/derivation/utils/canonicsig/nondep-expl-params/expected
@@ -1,6 +1,6 @@
 1/2: Building Infra (Infra.idr)
 2/2: Building CanonicSigCheck (CanonicSigCheck.idr)
-LOG gen.auto.canonic.check-sig:0: non-dependent type + expl params; all named; no givens:	OKAY
-LOG gen.auto.canonic.check-sig:0: non-dependent type + expl params; all named; 1st given:	OKAY
-LOG gen.auto.canonic.check-sig:0: non-dependent type + expl params; all named; 2nd given:	OKAY
-LOG gen.auto.canonic.check-sig:0: non-dependent type + expl params; all named; both given:	OKAY
+LOG deptycheck.canonic.check-sig:0: non-dependent type + expl params; all named; no givens:	OKAY
+LOG deptycheck.canonic.check-sig:0: non-dependent type + expl params; all named; 1st given:	OKAY
+LOG deptycheck.canonic.check-sig:0: non-dependent type + expl params; all named; 2nd given:	OKAY
+LOG deptycheck.canonic.check-sig:0: non-dependent type + expl params; all named; both given:	OKAY
diff --git a/tests/derivation/utils/canonicsig/nondep-mixed-params/expected b/tests/derivation/utils/canonicsig/nondep-mixed-params/expected
index 46c5a692c..fc6a54e01 100644
--- a/tests/derivation/utils/canonicsig/nondep-mixed-params/expected
+++ b/tests/derivation/utils/canonicsig/nondep-mixed-params/expected
@@ -1,6 +1,6 @@
 1/2: Building Infra (Infra.idr)
 2/2: Building CanonicSigCheck (CanonicSigCheck.idr)
-LOG gen.auto.canonic.check-sig:0: non-dependent type + mixed explicitness; all named; no givens:	OKAY
-LOG gen.auto.canonic.check-sig:0: non-dependent type + mixed explicitness; all named; 1st given:	OKAY
-LOG gen.auto.canonic.check-sig:0: non-dependent type + mixed explicitness; all named; 2nd given:	OKAY
-LOG gen.auto.canonic.check-sig:0: non-dependent type + mixed explicitness; all named; both given:	OKAY
+LOG deptycheck.canonic.check-sig:0: non-dependent type + mixed explicitness; all named; no givens:	OKAY
+LOG deptycheck.canonic.check-sig:0: non-dependent type + mixed explicitness; all named; 1st given:	OKAY
+LOG deptycheck.canonic.check-sig:0: non-dependent type + mixed explicitness; all named; 2nd given:	OKAY
+LOG deptycheck.canonic.check-sig:0: non-dependent type + mixed explicitness; all named; both given:	OKAY
diff --git a/tests/derivation/utils/canonicsig/trivial/expected b/tests/derivation/utils/canonicsig/trivial/expected
index 05d6e6842..584179c44 100644
--- a/tests/derivation/utils/canonicsig/trivial/expected
+++ b/tests/derivation/utils/canonicsig/trivial/expected
@@ -1,3 +1,3 @@
 1/2: Building Infra (Infra.idr)
 2/2: Building CanonicSigCheck (CanonicSigCheck.idr)
-LOG gen.auto.canonic.check-sig:0: trivial type; no givens:	OKAY
+LOG deptycheck.canonic.check-sig:0: trivial type; no givens:	OKAY
diff --git a/tests/derivation/utils/cons-analysis/_common-deep-cons-app/Infra.idr b/tests/derivation/utils/cons-analysis/_common-deep-cons-app/Infra.idr
index 2c93f7f49..e66feb66d 100644
--- a/tests/derivation/utils/cons-analysis/_common-deep-cons-app/Infra.idr
+++ b/tests/derivation/utils/cons-analysis/_common-deep-cons-app/Infra.idr
@@ -12,17 +12,17 @@ import Deriving.DepTyCheck.Gen.Core.Util
 printDeepConsApp : List Name -> TTImp -> Elab Unit
 printDeepConsApp freeNames tyExpr = do
   _ <- getNamesInfoInTypes' tyExpr
-  logMsg         "gen.auto.deep-cons-app" 0 ""
-  logMsg         "gen.auto.deep-cons-app" 0 "given free names:    \{show freeNames}"
-  logSugaredTerm "gen.auto.deep-cons-app" 0 "original expression" tyExpr
+  logMsg         "deptycheck.deep-cons-app" 0 ""
+  logMsg         "deptycheck.deep-cons-app" 0 "given free names:    \{show freeNames}"
+  logSugaredTerm "deptycheck.deep-cons-app" 0 "original expression" tyExpr
   let Right tyExpr = resolveNamesUniquely (fromList freeNames) tyExpr
-    | Left (n, alts) => logMsg "gen.auto.deep-cons-app" 0 "fail: name \{n} is not unique, alternatives: \{show alts}"
-  logSugaredTerm "gen.auto.deep-cons-app" 0 "resolved expression" tyExpr
-  logMsg         "gen.auto.deep-cons-app" 0 "------------------------"
+    | Left (n, alts) => logMsg "deptycheck.deep-cons-app" 0 "fail: name \{n} is not unique, alternatives: \{show alts}"
+  logSugaredTerm "deptycheck.deep-cons-app" 0 "resolved expression" tyExpr
+  logMsg         "deptycheck.deep-cons-app" 0 "------------------------"
   let Right (appliedNames ** bindExprF) = analyseDeepConsApp False (fromList freeNames) tyExpr
-    | Left err => logMsg "gen.auto.deep-cons-app" 0 "not a (deep) constructor application, reason: \{err}"
-  logMsg         "gen.auto.deep-cons-app" 0 "applied names:   \{show appliedNames}"
+    | Left err => logMsg "deptycheck.deep-cons-app" 0 "not a (deep) constructor application, reason: \{err}"
+  logMsg         "deptycheck.deep-cons-app" 0 "applied names:   \{show appliedNames}"
   let bindExpr = bindExprF $ \idx => bindVar $ show (index' appliedNames idx) ++ show idx
-  logSugaredTerm "gen.auto.deep-cons-app" 0 "bind expression" bindExpr
+  logSugaredTerm "deptycheck.deep-cons-app" 0 "bind expression" bindExpr
 
 %runElab consApps >>= traverse_ (uncurry printDeepConsApp)
diff --git a/tests/derivation/utils/cons-analysis/deep-cons-app-001/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-001/expected
index 30022ef5a..75a4839d1 100644
--- a/tests/derivation/utils/cons-analysis/deep-cons-app-001/expected
+++ b/tests/derivation/utils/cons-analysis/deep-cons-app-001/expected
@@ -1,44 +1,44 @@
 1/2: Building ConsApps (ConsApps.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a]
-LOG gen.auto.deep-cons-app:0: original expression: a
-LOG gen.auto.deep-cons-app:0: resolved expression: a
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [a]
-LOG gen.auto.deep-cons-app:0: bind expression: a0
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: Nat
-LOG gen.auto.deep-cons-app:0: resolved expression: Nat
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   []
-LOG gen.auto.deep-cons-app:0: bind expression: Nat
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [Nat]
-LOG gen.auto.deep-cons-app:0: original expression: Nat
-LOG gen.auto.deep-cons-app:0: resolved expression: Nat
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [Nat]
-LOG gen.auto.deep-cons-app:0: bind expression: Nat0
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a]
-LOG gen.auto.deep-cons-app:0: original expression: Vect n a
-LOG gen.auto.deep-cons-app:0: resolved expression: Vect n a
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [n, a]
-LOG gen.auto.deep-cons-app:0: bind expression: Vect n0 a1
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a]
-LOG gen.auto.deep-cons-app:0: original expression: Either a a
-LOG gen.auto.deep-cons-app:0: resolved expression: Either a a
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [a, a]
-LOG gen.auto.deep-cons-app:0: bind expression: Either a0 a1
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a, b]
-LOG gen.auto.deep-cons-app:0: original expression: X a a
-LOG gen.auto.deep-cons-app:0: resolved expression: X a a
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [a, a]
-LOG gen.auto.deep-cons-app:0: bind expression: X a0 a1
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a]
+LOG deptycheck.deep-cons-app:0: original expression: a
+LOG deptycheck.deep-cons-app:0: resolved expression: a
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [a]
+LOG deptycheck.deep-cons-app:0: bind expression: a0
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: Nat
+LOG deptycheck.deep-cons-app:0: resolved expression: Nat
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   []
+LOG deptycheck.deep-cons-app:0: bind expression: Nat
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [Nat]
+LOG deptycheck.deep-cons-app:0: original expression: Nat
+LOG deptycheck.deep-cons-app:0: resolved expression: Nat
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [Nat]
+LOG deptycheck.deep-cons-app:0: bind expression: Nat0
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a]
+LOG deptycheck.deep-cons-app:0: original expression: Vect n a
+LOG deptycheck.deep-cons-app:0: resolved expression: Vect n a
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [n, a]
+LOG deptycheck.deep-cons-app:0: bind expression: Vect n0 a1
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a]
+LOG deptycheck.deep-cons-app:0: original expression: Either a a
+LOG deptycheck.deep-cons-app:0: resolved expression: Either a a
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [a, a]
+LOG deptycheck.deep-cons-app:0: bind expression: Either a0 a1
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a, b]
+LOG deptycheck.deep-cons-app:0: original expression: X a a
+LOG deptycheck.deep-cons-app:0: resolved expression: X a a
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [a, a]
+LOG deptycheck.deep-cons-app:0: bind expression: X a0 a1
diff --git a/tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/expected
index 7ebea5e90..823bc836d 100644
--- a/tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/expected
+++ b/tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/expected
@@ -1,56 +1,56 @@
 1/2: Building ConsApps (ConsApps.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a]
-LOG gen.auto.deep-cons-app:0: original expression: b
-LOG gen.auto.deep-cons-app:0: resolved expression: b
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `b` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: a
-LOG gen.auto.deep-cons-app:0: resolved expression: a
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `a` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: X a a
-LOG gen.auto.deep-cons-app:0: resolved expression: X a a
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `a` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [b]
-LOG gen.auto.deep-cons-app:0: original expression: X a a
-LOG gen.auto.deep-cons-app:0: resolved expression: X a a
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `a` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a, b, X]
-LOG gen.auto.deep-cons-app:0: original expression: X a a
-LOG gen.auto.deep-cons-app:0: resolved expression: X a a
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: applying free name to some arguments
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: Y
-LOG gen.auto.deep-cons-app:0: resolved expression: Y
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `Y` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a]
-LOG gen.auto.deep-cons-app:0: original expression: Y
-LOG gen.auto.deep-cons-app:0: resolved expression: Y
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `Y` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a]
-LOG gen.auto.deep-cons-app:0: original expression: Y a
-LOG gen.auto.deep-cons-app:0: resolved expression: Y a
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `Y` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a]
-LOG gen.auto.deep-cons-app:0: original expression: Y a b
-LOG gen.auto.deep-cons-app:0: resolved expression: Y a b
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `Y` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a]
+LOG deptycheck.deep-cons-app:0: original expression: b
+LOG deptycheck.deep-cons-app:0: resolved expression: b
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `b` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: a
+LOG deptycheck.deep-cons-app:0: resolved expression: a
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `a` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: X a a
+LOG deptycheck.deep-cons-app:0: resolved expression: X a a
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `a` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [b]
+LOG deptycheck.deep-cons-app:0: original expression: X a a
+LOG deptycheck.deep-cons-app:0: resolved expression: X a a
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `a` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a, b, X]
+LOG deptycheck.deep-cons-app:0: original expression: X a a
+LOG deptycheck.deep-cons-app:0: resolved expression: X a a
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: applying free name to some arguments
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: Y
+LOG deptycheck.deep-cons-app:0: resolved expression: Y
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `Y` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a]
+LOG deptycheck.deep-cons-app:0: original expression: Y
+LOG deptycheck.deep-cons-app:0: resolved expression: Y
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `Y` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a]
+LOG deptycheck.deep-cons-app:0: original expression: Y a
+LOG deptycheck.deep-cons-app:0: resolved expression: Y a
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `Y` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a]
+LOG deptycheck.deep-cons-app:0: original expression: Y a b
+LOG deptycheck.deep-cons-app:0: resolved expression: Y a b
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `Y` is not a constructor
diff --git a/tests/derivation/utils/cons-analysis/deep-cons-app-003/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-003/expected
index 873792ce1..6e8722ad6 100644
--- a/tests/derivation/utils/cons-analysis/deep-cons-app-003/expected
+++ b/tests/derivation/utils/cons-analysis/deep-cons-app-003/expected
@@ -1,44 +1,44 @@
 1/2: Building ConsApps (ConsApps.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a]
-LOG gen.auto.deep-cons-app:0: original expression: Vect n Nat
-LOG gen.auto.deep-cons-app:0: resolved expression: Vect n Nat
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [n]
-LOG gen.auto.deep-cons-app:0: bind expression: Vect n0 Nat
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n]
-LOG gen.auto.deep-cons-app:0: original expression: Vect n Nat
-LOG gen.auto.deep-cons-app:0: resolved expression: Vect n Nat
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [n]
-LOG gen.auto.deep-cons-app:0: bind expression: Vect n0 Nat
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b]
-LOG gen.auto.deep-cons-app:0: original expression: Vect n (Either a b)
-LOG gen.auto.deep-cons-app:0: resolved expression: Vect n (Either a b)
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [n, a, b]
-LOG gen.auto.deep-cons-app:0: bind expression: Vect n0 (Either a1 b2)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b]
-LOG gen.auto.deep-cons-app:0: original expression: Vect (S n) (Either a b)
-LOG gen.auto.deep-cons-app:0: resolved expression: Vect (S n) (Either a b)
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [n, a, b]
-LOG gen.auto.deep-cons-app:0: bind expression: Vect (S n0) (Either a1 b2)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b]
-LOG gen.auto.deep-cons-app:0: original expression: Vect (S n) (Either a a)
-LOG gen.auto.deep-cons-app:0: resolved expression: Vect (S n) (Either a a)
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [n, a, a]
-LOG gen.auto.deep-cons-app:0: bind expression: Vect (S n0) (Either a1 a2)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b]
-LOG gen.auto.deep-cons-app:0: original expression: Vect (S (S n)) (Either a (X a a))
-LOG gen.auto.deep-cons-app:0: resolved expression: Vect (S (S n)) (Either a (X a a))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [n, a, a, a]
-LOG gen.auto.deep-cons-app:0: bind expression: Vect (S (S n0)) (Either a1 (X a2 a3))
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a]
+LOG deptycheck.deep-cons-app:0: original expression: Vect n Nat
+LOG deptycheck.deep-cons-app:0: resolved expression: Vect n Nat
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [n]
+LOG deptycheck.deep-cons-app:0: bind expression: Vect n0 Nat
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n]
+LOG deptycheck.deep-cons-app:0: original expression: Vect n Nat
+LOG deptycheck.deep-cons-app:0: resolved expression: Vect n Nat
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [n]
+LOG deptycheck.deep-cons-app:0: bind expression: Vect n0 Nat
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b]
+LOG deptycheck.deep-cons-app:0: original expression: Vect n (Either a b)
+LOG deptycheck.deep-cons-app:0: resolved expression: Vect n (Either a b)
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [n, a, b]
+LOG deptycheck.deep-cons-app:0: bind expression: Vect n0 (Either a1 b2)
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b]
+LOG deptycheck.deep-cons-app:0: original expression: Vect (S n) (Either a b)
+LOG deptycheck.deep-cons-app:0: resolved expression: Vect (S n) (Either a b)
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [n, a, b]
+LOG deptycheck.deep-cons-app:0: bind expression: Vect (S n0) (Either a1 b2)
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b]
+LOG deptycheck.deep-cons-app:0: original expression: Vect (S n) (Either a a)
+LOG deptycheck.deep-cons-app:0: resolved expression: Vect (S n) (Either a a)
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [n, a, a]
+LOG deptycheck.deep-cons-app:0: bind expression: Vect (S n0) (Either a1 a2)
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b]
+LOG deptycheck.deep-cons-app:0: original expression: Vect (S (S n)) (Either a (X a a))
+LOG deptycheck.deep-cons-app:0: resolved expression: Vect (S (S n)) (Either a (X a a))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [n, a, a, a]
+LOG deptycheck.deep-cons-app:0: bind expression: Vect (S (S n0)) (Either a1 (X a2 a3))
diff --git a/tests/derivation/utils/cons-analysis/deep-cons-app-004/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-004/expected
index cbbadb300..25ccd991a 100644
--- a/tests/derivation/utils/cons-analysis/deep-cons-app-004/expected
+++ b/tests/derivation/utils/cons-analysis/deep-cons-app-004/expected
@@ -1,65 +1,65 @@
 1/2: Building ConsApps (ConsApps.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: XX (Right Unit)
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Right ())
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   []
-LOG gen.auto.deep-cons-app:0: bind expression: XX (Right ())
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a]
-LOG gen.auto.deep-cons-app:0: original expression: XX (Right a)
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Right a)
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [a]
-LOG gen.auto.deep-cons-app:0: bind expression: XX (Right a0)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: XX (Right MkUnit)
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Right ())
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   []
-LOG gen.auto.deep-cons-app:0: bind expression: XX (Right ())
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: XX (Right [])
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Right [])
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   []
-LOG gen.auto.deep-cons-app:0: bind expression: XX (Right [])
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b]
-LOG gen.auto.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S Z) `MC` (S (S (S Z)) `MC` MM))))
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MM))))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   []
-LOG gen.auto.deep-cons-app:0: bind expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MM))))
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b]
-LOG gen.auto.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S n) `MC` (S (S (S Z)) `MC` MM))))
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (S (S n) `MC` (3 `MC` MM))))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [n]
-LOG gen.auto.deep-cons-app:0: bind expression: XX (Left (1 `MC` (S (S n0) `MC` (3 `MC` MM))))
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S Z) `MC` (S (S (S Z)) `MC` MM))))
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MM))))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   []
-LOG gen.auto.deep-cons-app:0: bind expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MM))))
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b, c]
-LOG gen.auto.deep-cons-app:0: original expression: XX (Left (a `MC` (b `MC` (c `MC` MM))))
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Left (a `MC` (b `MC` (c `MC` MM))))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [a, b, c]
-LOG gen.auto.deep-cons-app:0: bind expression: XX (Left (a0 `MC` (b1 `MC` (c2 `MC` MM))))
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b, c]
-LOG gen.auto.deep-cons-app:0: original expression: XX (Left (a `MC` (Z `MC` (c `MC` MM))))
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Left (a `MC` (0 `MC` (c `MC` MM))))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [a, c]
-LOG gen.auto.deep-cons-app:0: bind expression: XX (Left (a0 `MC` (0 `MC` (c1 `MC` MM))))
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: XX (Right Unit)
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Right ())
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   []
+LOG deptycheck.deep-cons-app:0: bind expression: XX (Right ())
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a]
+LOG deptycheck.deep-cons-app:0: original expression: XX (Right a)
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Right a)
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [a]
+LOG deptycheck.deep-cons-app:0: bind expression: XX (Right a0)
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: XX (Right MkUnit)
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Right ())
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   []
+LOG deptycheck.deep-cons-app:0: bind expression: XX (Right ())
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: XX (Right [])
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Right [])
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   []
+LOG deptycheck.deep-cons-app:0: bind expression: XX (Right [])
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b]
+LOG deptycheck.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S Z) `MC` (S (S (S Z)) `MC` MM))))
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MM))))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   []
+LOG deptycheck.deep-cons-app:0: bind expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MM))))
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b]
+LOG deptycheck.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S n) `MC` (S (S (S Z)) `MC` MM))))
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (S (S n) `MC` (3 `MC` MM))))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [n]
+LOG deptycheck.deep-cons-app:0: bind expression: XX (Left (1 `MC` (S (S n0) `MC` (3 `MC` MM))))
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S Z) `MC` (S (S (S Z)) `MC` MM))))
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MM))))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   []
+LOG deptycheck.deep-cons-app:0: bind expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MM))))
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b, c]
+LOG deptycheck.deep-cons-app:0: original expression: XX (Left (a `MC` (b `MC` (c `MC` MM))))
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Left (a `MC` (b `MC` (c `MC` MM))))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [a, b, c]
+LOG deptycheck.deep-cons-app:0: bind expression: XX (Left (a0 `MC` (b1 `MC` (c2 `MC` MM))))
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b, c]
+LOG deptycheck.deep-cons-app:0: original expression: XX (Left (a `MC` (Z `MC` (c `MC` MM))))
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Left (a `MC` (0 `MC` (c `MC` MM))))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [a, c]
+LOG deptycheck.deep-cons-app:0: bind expression: XX (Left (a0 `MC` (0 `MC` (c1 `MC` MM))))
diff --git a/tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/expected
index 694cb784e..1e3d0fefa 100644
--- a/tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/expected
+++ b/tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/expected
@@ -1,50 +1,50 @@
 1/2: Building ConsApps (ConsApps.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: XX (Rigt Unit)
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Rigt ())
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `Rigt` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a]
-LOG gen.auto.deep-cons-app:0: original expression: XX (Rigt a)
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Rigt a)
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `Rigt` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: XX (Rigt MkUnit)
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Rigt ())
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `Rigt` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: XX (Rigt [])
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Rigt [])
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `Rigt` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b]
-LOG gen.auto.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S Z) `MC` (S (S (S m)) `MC` MM))))
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (2 `MC` (S (S (S m)) `MC` MM))))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `m` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S Z) `MC` (S (S (S Z)) `MC` MX))))
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MX))))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `MX` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b]
-LOG gen.auto.deep-cons-app:0: original expression: XX (Left (a `MC` (b `MC` (c `MC` MM))))
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Left (a `MC` (b `MC` (c `MC` MM))))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `c` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [n, a, b]
-LOG gen.auto.deep-cons-app:0: original expression: XX (Left (a `MC` (Z `MC` (c `MC` MM))))
-LOG gen.auto.deep-cons-app:0: resolved expression: XX (Left (a `MC` (0 `MC` (c `MC` MM))))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `c` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: XX (Rigt Unit)
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Rigt ())
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `Rigt` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a]
+LOG deptycheck.deep-cons-app:0: original expression: XX (Rigt a)
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Rigt a)
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `Rigt` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: XX (Rigt MkUnit)
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Rigt ())
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `Rigt` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: XX (Rigt [])
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Rigt [])
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `Rigt` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b]
+LOG deptycheck.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S Z) `MC` (S (S (S m)) `MC` MM))))
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (2 `MC` (S (S (S m)) `MC` MM))))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `m` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: XX (Left (S Z `MC` (S (S Z) `MC` (S (S (S Z)) `MC` MX))))
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Left (1 `MC` (2 `MC` (3 `MC` MX))))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `MX` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b]
+LOG deptycheck.deep-cons-app:0: original expression: XX (Left (a `MC` (b `MC` (c `MC` MM))))
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Left (a `MC` (b `MC` (c `MC` MM))))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `c` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [n, a, b]
+LOG deptycheck.deep-cons-app:0: original expression: XX (Left (a `MC` (Z `MC` (c `MC` MM))))
+LOG deptycheck.deep-cons-app:0: resolved expression: XX (Left (a `MC` (0 `MC` (c `MC` MM))))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `c` is not a constructor
diff --git a/tests/derivation/utils/cons-analysis/deep-cons-app-006/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-006/expected
index c8e0b07de..04f68f468 100644
--- a/tests/derivation/utils/cons-analysis/deep-cons-app-006/expected
+++ b/tests/derivation/utils/cons-analysis/deep-cons-app-006/expected
@@ -1,64 +1,64 @@
 1/2: Building ConsApps (ConsApps.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    []
-LOG gen.auto.deep-cons-app:0: original expression: Nat
-LOG gen.auto.deep-cons-app:0: resolved expression: Nat
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   []
-LOG gen.auto.deep-cons-app:0: bind expression: Nat
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [{arg:1}]
-LOG gen.auto.deep-cons-app:0: original expression: Nat
-LOG gen.auto.deep-cons-app:0: resolved expression: Nat
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   []
-LOG gen.auto.deep-cons-app:0: bind expression: Nat
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [elem]
-LOG gen.auto.deep-cons-app:0: original expression: Vect 0 elem
-LOG gen.auto.deep-cons-app:0: resolved expression: Vect 0 elem
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [elem]
-LOG gen.auto.deep-cons-app:0: bind expression: Vect 0 elem0
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [len, elem, x, xs]
-LOG gen.auto.deep-cons-app:0: original expression: Vect (S len) elem
-LOG gen.auto.deep-cons-app:0: resolved expression: Vect (S len) elem
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [len, elem]
-LOG gen.auto.deep-cons-app:0: bind expression: Vect (S len0) elem1
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [{a:1053}]
-LOG gen.auto.deep-cons-app:0: original expression: Split []
-LOG gen.auto.deep-cons-app:0: resolved expression: Split []
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [{a:1053}, {a:1053}]
-LOG gen.auto.deep-cons-app:0: bind expression: Split []
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a, x]
-LOG gen.auto.deep-cons-app:0: original expression: Split [x]
-LOG gen.auto.deep-cons-app:0: resolved expression: Split [x]
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [a, a, x, a]
-LOG gen.auto.deep-cons-app:0: bind expression: Split [x2]
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a, x, xs, y, ys]
-LOG gen.auto.deep-cons-app:0: original expression: Split (x :: (xs ++ (y :: ys)))
-LOG gen.auto.deep-cons-app:0: resolved expression: Split (x :: (xs ++ (y :: ys)))
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: not a (deep) constructor application, reason: name `Prelude.Types.List.(++)` is not a constructor
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a, x]
-LOG gen.auto.deep-cons-app:0: original expression: x = x
-LOG gen.auto.deep-cons-app:0: resolved expression: x = x
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [a, a, x, x]
-LOG gen.auto.deep-cons-app:0: bind expression: x2 = x3
-LOG gen.auto.deep-cons-app:0: 
-LOG gen.auto.deep-cons-app:0: given free names:    [a, x]
-LOG gen.auto.deep-cons-app:0: original expression: EqExp a a x x
-LOG gen.auto.deep-cons-app:0: resolved expression: EqExp a a x x
-LOG gen.auto.deep-cons-app:0: ------------------------
-LOG gen.auto.deep-cons-app:0: applied names:   [a, a, x, x]
-LOG gen.auto.deep-cons-app:0: bind expression: EqExp a0 a1 x2 x3
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    []
+LOG deptycheck.deep-cons-app:0: original expression: Nat
+LOG deptycheck.deep-cons-app:0: resolved expression: Nat
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   []
+LOG deptycheck.deep-cons-app:0: bind expression: Nat
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [{arg:1}]
+LOG deptycheck.deep-cons-app:0: original expression: Nat
+LOG deptycheck.deep-cons-app:0: resolved expression: Nat
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   []
+LOG deptycheck.deep-cons-app:0: bind expression: Nat
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [elem]
+LOG deptycheck.deep-cons-app:0: original expression: Vect 0 elem
+LOG deptycheck.deep-cons-app:0: resolved expression: Vect 0 elem
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [elem]
+LOG deptycheck.deep-cons-app:0: bind expression: Vect 0 elem0
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [len, elem, x, xs]
+LOG deptycheck.deep-cons-app:0: original expression: Vect (S len) elem
+LOG deptycheck.deep-cons-app:0: resolved expression: Vect (S len) elem
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [len, elem]
+LOG deptycheck.deep-cons-app:0: bind expression: Vect (S len0) elem1
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [{a:1053}]
+LOG deptycheck.deep-cons-app:0: original expression: Split []
+LOG deptycheck.deep-cons-app:0: resolved expression: Split []
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [{a:1053}, {a:1053}]
+LOG deptycheck.deep-cons-app:0: bind expression: Split []
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a, x]
+LOG deptycheck.deep-cons-app:0: original expression: Split [x]
+LOG deptycheck.deep-cons-app:0: resolved expression: Split [x]
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [a, a, x, a]
+LOG deptycheck.deep-cons-app:0: bind expression: Split [x2]
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a, x, xs, y, ys]
+LOG deptycheck.deep-cons-app:0: original expression: Split (x :: (xs ++ (y :: ys)))
+LOG deptycheck.deep-cons-app:0: resolved expression: Split (x :: (xs ++ (y :: ys)))
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: not a (deep) constructor application, reason: name `Prelude.Types.List.(++)` is not a constructor
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a, x]
+LOG deptycheck.deep-cons-app:0: original expression: x = x
+LOG deptycheck.deep-cons-app:0: resolved expression: x = x
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [a, a, x, x]
+LOG deptycheck.deep-cons-app:0: bind expression: x2 = x3
+LOG deptycheck.deep-cons-app:0: 
+LOG deptycheck.deep-cons-app:0: given free names:    [a, x]
+LOG deptycheck.deep-cons-app:0: original expression: EqExp a a x x
+LOG deptycheck.deep-cons-app:0: resolved expression: EqExp a a x x
+LOG deptycheck.deep-cons-app:0: ------------------------
+LOG deptycheck.deep-cons-app:0: applied names:   [a, a, x, x]
+LOG deptycheck.deep-cons-app:0: bind expression: EqExp a0 a1 x2 x3
diff --git a/tests/derivation/utils/involved-types/_common-involved-types/Infra.idr b/tests/derivation/utils/involved-types/_common-involved-types/Infra.idr
index 79f30f9c2..b8e74ec17 100644
--- a/tests/derivation/utils/involved-types/_common-involved-types/Infra.idr
+++ b/tests/derivation/utils/involved-types/_common-involved-types/Infra.idr
@@ -8,14 +8,14 @@ import Deriving.DepTyCheck.Gen.Core.Util
 
 printInvolvedTypesVerdict : Name -> Count -> List Name -> Elab Unit
 printInvolvedTypesVerdict tyName minRig expected = do
-  logMsg "gen.auto.involved-types" 0 "given type: \{show tyName}"
+  logMsg "deptycheck.involved-types" 0 "given type: \{show tyName}"
   invTys <- allInvolvedTypes minRig !(getInfo' tyName)
   let invTys   = sortBy (comparing show) $ invTys <&> name
   expected <- for expected $ map TypeInfo.name . getInfo'
   let expected = sortBy (comparing show) expected
   when (invTys /= expected) $ do
-    logMsg "gen.auto.involved-types" 0 "-------- !!! --------"
-    logMsg "gen.auto.involved-types" 0 "found   : \{show invTys}"
-    logMsg "gen.auto.involved-types" 0 "expected: \{show expected}"
+    logMsg "deptycheck.involved-types" 0 "-------- !!! --------"
+    logMsg "deptycheck.involved-types" 0 "found   : \{show invTys}"
+    logMsg "deptycheck.involved-types" 0 "expected: \{show expected}"
 
 %runElab for_ typesAndInvolved $ \(n, r, ns) => printInvolvedTypesVerdict n r ns
diff --git a/tests/derivation/utils/involved-types/norec-001/expected b/tests/derivation/utils/involved-types/norec-001/expected
index 0c87999b2..03efd5349 100644
--- a/tests/derivation/utils/involved-types/norec-001/expected
+++ b/tests/derivation/utils/involved-types/norec-001/expected
@@ -1,10 +1,10 @@
 1/2: Building TypesAndInvolved (TypesAndInvolved.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.involved-types:0: given type: Bool
-LOG gen.auto.involved-types:0: given type: Bool
-LOG gen.auto.involved-types:0: given type: Bool
-LOG gen.auto.involved-types:0: given type: Bool
-LOG gen.auto.involved-types:0: given type: X
-LOG gen.auto.involved-types:0: given type: X
-LOG gen.auto.involved-types:0: given type: X
-LOG gen.auto.involved-types:0: given type: X
+LOG deptycheck.involved-types:0: given type: Bool
+LOG deptycheck.involved-types:0: given type: Bool
+LOG deptycheck.involved-types:0: given type: Bool
+LOG deptycheck.involved-types:0: given type: Bool
+LOG deptycheck.involved-types:0: given type: X
+LOG deptycheck.involved-types:0: given type: X
+LOG deptycheck.involved-types:0: given type: X
+LOG deptycheck.involved-types:0: given type: X
diff --git a/tests/derivation/utils/involved-types/rec-001/expected b/tests/derivation/utils/involved-types/rec-001/expected
index 3ee689d0f..719477608 100644
--- a/tests/derivation/utils/involved-types/rec-001/expected
+++ b/tests/derivation/utils/involved-types/rec-001/expected
@@ -1,6 +1,6 @@
 1/2: Building TypesAndInvolved (TypesAndInvolved.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.involved-types:0: given type: Nat
-LOG gen.auto.involved-types:0: given type: List
-LOG gen.auto.involved-types:0: given type: Vect
-LOG gen.auto.involved-types:0: given type: Vect
+LOG deptycheck.involved-types:0: given type: Nat
+LOG deptycheck.involved-types:0: given type: List
+LOG deptycheck.involved-types:0: given type: Vect
+LOG deptycheck.involved-types:0: given type: Vect
diff --git a/tests/derivation/utils/involved-types/rec-002/expected b/tests/derivation/utils/involved-types/rec-002/expected
index d5edff34f..d424e6131 100644
--- a/tests/derivation/utils/involved-types/rec-002/expected
+++ b/tests/derivation/utils/involved-types/rec-002/expected
@@ -1,4 +1,4 @@
 1/2: Building TypesAndInvolved (TypesAndInvolved.idr)
 2/2: Building Infra (Infra.idr)
-LOG gen.auto.involved-types:0: given type: X
-LOG gen.auto.involved-types:0: given type: TTImp
+LOG deptycheck.involved-types:0: given type: X
+LOG deptycheck.involved-types:0: given type: TTImp
diff --git a/tests/derivation/utils/up-to-renaming-ttimp-eq/_common/Infra.idr b/tests/derivation/utils/up-to-renaming-ttimp-eq/_common/Infra.idr
index f7250f965..5a85f57a8 100644
--- a/tests/derivation/utils/up-to-renaming-ttimp-eq/_common/Infra.idr
+++ b/tests/derivation/utils/up-to-renaming-ttimp-eq/_common/Infra.idr
@@ -30,7 +30,7 @@ checkEq desc res e1 e2 = do
   e2 <- toTTImp e2
   let ch1 : String -> TTImp -> TTImp -> Elab Unit
       ch1 desc l r = do
-        logMsg "gen.auto.reflection.ttimp-eq-up-to-renamings" 0 $ if (l == r) @{UpToRenaming} == res
+        logMsg "deptycheck.reflection.ttimp-eq-up-to-renamings" 0 $ if (l == r) @{UpToRenaming} == res
           then "\{desc}: OKAY"
           else """
                \{desc}: FAILED
diff --git a/tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/expected b/tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/expected
index 7144c165e..e7b4781a2 100644
--- a/tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/expected
+++ b/tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/expected
@@ -1,130 +1,130 @@
 1/2: Building Infra (Infra.idr)
 2/2: Building RenamingTTImpEqCheck (RenamingTTImpEqCheck.idr)
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused e (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused e (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused e (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused e (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused e (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused e (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused e (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused e (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused q (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused q (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused q (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused q (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused q (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused q (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused q (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused q (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, diff names (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: fst, rename, same names (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, diff names (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, rename, same names (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` q (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, `_` e (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: flipped lambda, unnamed (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: snd, shadow, rename (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused e (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused e (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused e (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused e (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused e (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused e (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused e (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused e (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused q (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused q (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused q (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused q (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused q (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused q (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused q (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused q (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unnamed unused' (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' e (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: _ unused' q (wrap case) <<: OKAY
diff --git a/tests/derivation/utils/up-to-renaming-ttimp-eq/simple/expected b/tests/derivation/utils/up-to-renaming-ttimp-eq/simple/expected
index 8caaa4265..eb593aca5 100644
--- a/tests/derivation/utils/up-to-renaming-ttimp-eq/simple/expected
+++ b/tests/derivation/utils/up-to-renaming-ttimp-eq/simple/expected
@@ -1,146 +1,146 @@
 1/2: Building Infra (Infra.idr)
 2/2: Building RenamingTTImpEqCheck (RenamingTTImpEqCheck.idr)
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is zero (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is zero (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is zero (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is zero (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is zero (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is zero (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is zero (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is zero (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is not one (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is not one (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is not one (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is not one (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is not one (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is not one (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is not one (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: zero is not one (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is list (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is list (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is list (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is list (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is list (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is list (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is list (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is list (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is not vect (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is not vect (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is not vect (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is not vect (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is not vect (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is not vect (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is not vect (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: list is not vect (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is succ (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is succ (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is succ (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is succ (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is succ (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is succ (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is succ (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is succ (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (wrap case) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (plain) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (plain) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (ap z) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (ap z) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (ap cross) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (ap cross) <<: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (wrap case) >>: OKAY
-LOG gen.auto.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not its value (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is zero (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is zero (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is zero (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is zero (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is zero (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is zero (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is zero (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is zero (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is not one (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is not one (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is not one (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is not one (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is not one (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is not one (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is not one (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: zero is not one (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: one (cons) is one (nat lit) (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat one is not integer one (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is list (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is list (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is list (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is list (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is list (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is list (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is list (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is list (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is not vect (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is not vect (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is not vect (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is not vect (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is not vect (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is not vect (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is not vect (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: list is not vect (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is succ (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is succ (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is succ (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is succ (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is succ (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is succ (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is succ (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is succ (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: succ is not zero (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is unit (ttimp) (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: unit is not some other `Unit` (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is nat id (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat id is not string id (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is nat fun ty (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: nat fun ty is not string fun ty (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is itself (wrap case) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (plain) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (plain) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (ap z) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (ap z) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (ap cross) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (ap cross) <<: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (wrap case) >>: OKAY
+LOG deptycheck.reflection.ttimp-eq-up-to-renamings:0: dep ty fun is not another one (wrap case) <<: OKAY