diff --git a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__map_in_map.snap b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__map_in_map.snap
index c87f4655..a5c89b44 100644
--- a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__map_in_map.snap
+++ b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__map_in_map.snap
@@ -13,7 +13,7 @@ description: "Code:\n\npub type OuterMap =\n    List<Pair<Int, InnerMap>>\n\npub
   "redeemer": {
     "title": "_redeemer",
     "schema": {
-      "$ref": "#/definitions/OuterMap"
+      "$ref": "#/definitions/test_module~1OuterMap"
     }
   },
   "compiledCode": "<redacted>",
@@ -36,29 +36,9 @@ description: "Code:\n\npub type OuterMap =\n    List<Pair<Int, InnerMap>>\n\npub
         }
       ]
     },
-    "InnerMap": {
-      "title": "InnerMap",
-      "dataType": "map",
-      "keys": {
-        "$ref": "#/definitions/Int"
-      },
-      "values": {
-        "$ref": "#/definitions/Bool"
-      }
-    },
     "Int": {
       "dataType": "integer"
     },
-    "OuterMap": {
-      "title": "OuterMap",
-      "dataType": "map",
-      "keys": {
-        "$ref": "#/definitions/Int"
-      },
-      "values": {
-        "$ref": "#/definitions/InnerMap"
-      }
-    },
     "Void": {
       "title": "Unit",
       "anyOf": [
@@ -68,6 +48,26 @@ description: "Code:\n\npub type OuterMap =\n    List<Pair<Int, InnerMap>>\n\npub
           "fields": []
         }
       ]
+    },
+    "test_module/InnerMap": {
+      "title": "InnerMap",
+      "dataType": "map",
+      "keys": {
+        "$ref": "#/definitions/Int"
+      },
+      "values": {
+        "$ref": "#/definitions/Bool"
+      }
+    },
+    "test_module/OuterMap": {
+      "title": "OuterMap",
+      "dataType": "map",
+      "keys": {
+        "$ref": "#/definitions/Int"
+      },
+      "values": {
+        "$ref": "#/definitions/test_module~1InnerMap"
+      }
     }
   }
 }
diff --git a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_of_lists.snap b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_of_lists.snap
index 6f492bd9..8fe5774c 100644
--- a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_of_lists.snap
+++ b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_of_lists.snap
@@ -13,7 +13,7 @@ description: "Code:\n\npub type MyPair =\n  Pair<List<Int>, Bool>\n\nvalidator p
   "redeemer": {
     "title": "_redeemer",
     "schema": {
-      "$ref": "#/definitions/MyPair"
+      "$ref": "#/definitions/test_module~1MyPair"
     }
   },
   "compiledCode": "<redacted>",
@@ -49,7 +49,7 @@ description: "Code:\n\npub type MyPair =\n  Pair<List<Int>, Bool>\n\nvalidator p
         "$ref": "#/definitions/Int"
       }
     },
-    "MyPair": {
+    "test_module/MyPair": {
       "title": "MyPair",
       "dataType": "list",
       "items": [
diff --git a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_used_after_map.snap b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_used_after_map.snap
index c1f9ac28..c4201dc5 100644
--- a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_used_after_map.snap
+++ b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_used_after_map.snap
@@ -22,7 +22,7 @@ description: "Code:\n\npub type MyPair =\n  Pair<Int, Int>\n\npub type MyDatum {
     "Int": {
       "dataType": "integer"
     },
-    "List$MyPair": {
+    "List$test_module/MyPair": {
       "dataType": "map",
       "keys": {
         "$ref": "#/definitions/Int"
@@ -31,18 +31,6 @@ description: "Code:\n\npub type MyPair =\n  Pair<Int, Int>\n\npub type MyDatum {
         "$ref": "#/definitions/Int"
       }
     },
-    "MyPair": {
-      "title": "MyPair",
-      "dataType": "list",
-      "items": [
-        {
-          "$ref": "#/definitions/Int"
-        },
-        {
-          "$ref": "#/definitions/Int"
-        }
-      ]
-    },
     "Void": {
       "title": "Unit",
       "anyOf": [
@@ -63,15 +51,27 @@ description: "Code:\n\npub type MyPair =\n  Pair<Int, Int>\n\npub type MyDatum {
           "fields": [
             {
               "title": "pairs",
-              "$ref": "#/definitions/List$MyPair"
+              "$ref": "#/definitions/List$test_module~1MyPair"
             },
             {
               "title": "pair",
-              "$ref": "#/definitions/MyPair"
+              "$ref": "#/definitions/test_module~1MyPair"
             }
           ]
         }
       ]
+    },
+    "test_module/MyPair": {
+      "title": "MyPair",
+      "dataType": "list",
+      "items": [
+        {
+          "$ref": "#/definitions/Int"
+        },
+        {
+          "$ref": "#/definitions/Int"
+        }
+      ]
     }
   }
 }
diff --git a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_used_before_map.snap b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_used_before_map.snap
index 1ecdb0d7..04f7b57e 100644
--- a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_used_before_map.snap
+++ b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__pair_used_before_map.snap
@@ -22,7 +22,7 @@ description: "Code:\n\npub type MyPair =\n  Pair<Int, Int>\n\npub type MyDatum {
     "Int": {
       "dataType": "integer"
     },
-    "List$MyPair": {
+    "List$test_module/MyPair": {
       "dataType": "map",
       "keys": {
         "$ref": "#/definitions/Int"
@@ -31,18 +31,6 @@ description: "Code:\n\npub type MyPair =\n  Pair<Int, Int>\n\npub type MyDatum {
         "$ref": "#/definitions/Int"
       }
     },
-    "MyPair": {
-      "title": "MyPair",
-      "dataType": "list",
-      "items": [
-        {
-          "$ref": "#/definitions/Int"
-        },
-        {
-          "$ref": "#/definitions/Int"
-        }
-      ]
-    },
     "Void": {
       "title": "Unit",
       "anyOf": [
@@ -63,15 +51,27 @@ description: "Code:\n\npub type MyPair =\n  Pair<Int, Int>\n\npub type MyDatum {
           "fields": [
             {
               "title": "pair",
-              "$ref": "#/definitions/MyPair"
+              "$ref": "#/definitions/test_module~1MyPair"
             },
             {
               "title": "pairs",
-              "$ref": "#/definitions/List$MyPair"
+              "$ref": "#/definitions/List$test_module~1MyPair"
             }
           ]
         }
       ]
+    },
+    "test_module/MyPair": {
+      "title": "MyPair",
+      "dataType": "list",
+      "items": [
+        {
+          "$ref": "#/definitions/Int"
+        },
+        {
+          "$ref": "#/definitions/Int"
+        }
+      ]
     }
   }
 }
diff --git a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__simplified_hydra.snap b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__simplified_hydra.snap
index 3a54c1ba..e86c1734 100644
--- a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__simplified_hydra.snap
+++ b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__simplified_hydra.snap
@@ -26,16 +26,12 @@ description: "Code:\n\n/// On-chain state\npub type State {\n    /// The contest
     "Int": {
       "dataType": "integer"
     },
-    "List$Party": {
+    "List$test_module/Party": {
       "dataType": "list",
       "items": {
-        "$ref": "#/definitions/Party"
+        "$ref": "#/definitions/test_module~1Party"
       }
     },
-    "Party": {
-      "title": "Party",
-      "dataType": "bytes"
-    },
     "test_module/ContestationPeriod": {
       "title": "ContestationPeriod",
       "description": "Whatever",
@@ -77,6 +73,10 @@ description: "Code:\n\n/// On-chain state\npub type State {\n    /// The contest
         }
       ]
     },
+    "test_module/Party": {
+      "title": "Party",
+      "dataType": "bytes"
+    },
     "test_module/State": {
       "title": "State",
       "description": "On-chain state",
@@ -94,7 +94,7 @@ description: "Code:\n\n/// On-chain state\npub type State {\n    /// The contest
             {
               "title": "parties",
               "description": "List of public key hashes of all participants",
-              "$ref": "#/definitions/List$Party"
+              "$ref": "#/definitions/List$test_module~1Party"
             },
             {
               "title": "utxoHash",
diff --git a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__type_aliases.snap b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__type_aliases.snap
index 25351dd4..0e3fcca1 100644
--- a/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__type_aliases.snap
+++ b/crates/aiken-project/src/blueprint/snapshots/aiken_project__blueprint__validator__tests__type_aliases.snap
@@ -13,36 +13,12 @@ description: "Code:\n\npub type Asset = (ByteArray, Int)\n\npub type POSIXTime =
   "redeemer": {
     "title": "redeemer",
     "schema": {
-      "$ref": "#/definitions/test_module~1MyRedeemer$Asset"
+      "$ref": "#/definitions/test_module~1MyRedeemer$test_module~1Asset"
     }
   },
   "compiledCode": "<redacted>",
   "hash": "<redacted>",
   "definitions": {
-    "AlwaysNone": {
-      "title": "AlwaysNone",
-      "anyOf": [
-        {
-          "title": "Never",
-          "description": "Nothing.",
-          "dataType": "constructor",
-          "index": 1,
-          "fields": []
-        }
-      ]
-    },
-    "Asset": {
-      "title": "Asset",
-      "dataType": "list",
-      "items": [
-        {
-          "$ref": "#/definitions/ByteArray"
-        },
-        {
-          "$ref": "#/definitions/Int"
-        }
-      ]
-    },
     "Bool": {
       "title": "Bool",
       "anyOf": [
@@ -66,38 +42,58 @@ description: "Code:\n\npub type Asset = (ByteArray, Int)\n\npub type POSIXTime =
     "Int": {
       "dataType": "integer"
     },
-    "List$Asset": {
+    "List$test_module/Asset": {
       "dataType": "list",
       "items": {
-        "$ref": "#/definitions/Asset"
+        "$ref": "#/definitions/test_module~1Asset"
       }
     },
-    "POSIXTime": {
-      "title": "POSIXTime",
-      "dataType": "integer"
-    },
-    "Pair$POSIXTime_Bool": {
+    "Pair$test_module/POSIXTime_Bool": {
       "title": "Pair",
       "dataType": "list",
       "items": [
         {
-          "$ref": "#/definitions/POSIXTime"
+          "$ref": "#/definitions/test_module~1POSIXTime"
         },
         {
           "$ref": "#/definitions/Bool"
         }
       ]
     },
-    "Pairs$Asset_POSIXTime": {
+    "Pairs$test_module/Asset_test_module/POSIXTime": {
       "title": "Pairs<a, POSIXTime>",
       "dataType": "map",
       "keys": {
-        "$ref": "#/definitions/Asset"
+        "$ref": "#/definitions/test_module~1Asset"
       },
       "values": {
-        "$ref": "#/definitions/POSIXTime"
+        "$ref": "#/definitions/test_module~1POSIXTime"
       }
     },
+    "test_module/AlwaysNone": {
+      "title": "AlwaysNone",
+      "anyOf": [
+        {
+          "title": "Never",
+          "description": "Nothing.",
+          "dataType": "constructor",
+          "index": 1,
+          "fields": []
+        }
+      ]
+    },
+    "test_module/Asset": {
+      "title": "Asset",
+      "dataType": "list",
+      "items": [
+        {
+          "$ref": "#/definitions/ByteArray"
+        },
+        {
+          "$ref": "#/definitions/Int"
+        }
+      ]
+    },
     "test_module/MyDatum": {
       "title": "MyDatum",
       "anyOf": [
@@ -107,7 +103,7 @@ description: "Code:\n\npub type Asset = (ByteArray, Int)\n\npub type POSIXTime =
           "index": 0,
           "fields": [
             {
-              "$ref": "#/definitions/AlwaysNone"
+              "$ref": "#/definitions/test_module~1AlwaysNone"
             }
           ]
         },
@@ -117,13 +113,13 @@ description: "Code:\n\npub type Asset = (ByteArray, Int)\n\npub type POSIXTime =
           "index": 1,
           "fields": [
             {
-              "$ref": "#/definitions/Pair$POSIXTime_Bool"
+              "$ref": "#/definitions/Pair$test_module~1POSIXTime_Bool"
             }
           ]
         }
       ]
     },
-    "test_module/MyRedeemer$Asset": {
+    "test_module/MyRedeemer$test_module/Asset": {
       "title": "MyRedeemer",
       "anyOf": [
         {
@@ -133,15 +129,19 @@ description: "Code:\n\npub type Asset = (ByteArray, Int)\n\npub type POSIXTime =
           "fields": [
             {
               "title": "fst_field",
-              "$ref": "#/definitions/List$Asset"
+              "$ref": "#/definitions/List$test_module~1Asset"
             },
             {
               "title": "snd_field",
-              "$ref": "#/definitions/Pairs$Asset_POSIXTime"
+              "$ref": "#/definitions/Pairs$test_module~1Asset_test_module~1POSIXTime"
             }
           ]
         }
       ]
+    },
+    "test_module/POSIXTime": {
+      "title": "POSIXTime",
+      "dataType": "integer"
     }
   }
 }