Fix tests

tests/modsys/T13.icry.stdout

@@ -1,7 +1,7 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading module T13::B$argument
-Loading interface module T13::A$interface
+Loading module `where` argument of T13::B
+Loading interface module `parameter` interface of T13::A
 Loading module T13::A
 Loading module T13::B
 Loading module T13::Main

tests/modsys/T2.icry.stdout

@@ -1,7 +1,7 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading module T2::Main$argument
-Loading interface module T2::A$interface
+Loading module `where` argument of T2::Main
+Loading interface module `parameter` interface of T2::A
 Loading module T2::A
 Loading module T2::Main
 0x00

tests/modsys/T3.icry.stdout

@@ -1,6 +1,6 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading interface module T3::A$interface
+Loading interface module `parameter` interface of T3::A
 Loading module T3::A
 Loading module T3::Main
 

tests/modsys/T4.icry.stdout

@@ -1,7 +1,7 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading module T4::Main$argument
-Loading interface module T4::A$interface
+Loading module `where` argument of T4::Main
+Loading interface module `parameter` interface of T4::A
 Loading module T4::A
 Loading module T4::Main
 main : [8]

tests/modsys/T5.icry.stdout

@@ -1,6 +1,6 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading module T5::Main$argument
+Loading module `where` argument of T5::Main
 
 Parse error at ./T5/B.cry:4:3--4:4
   Instantiation of a parameterized module may not itself be parameterized

tests/modsys/T6.icry.stdout

@@ -1,6 +1,6 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading module T5::Main$argument
+Loading module `where` argument of T5::Main
 
 Parse error at ./T5/B.cry:4:3--4:4
   Instantiation of a parameterized module may not itself be parameterized

tests/modsys/T7.icry.stdout

@@ -1,6 +1,6 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading interface module T7::Main$interface
+Loading interface module `parameter` interface of T7::Main
 Loading module T7::Main
 
 Expression depends on definitions from a parameterized module:

tests/modsys/functors/T010.icry.stdout

@@ -1,6 +1,6 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading module T010$argument
+Loading module `where` argument of T010
 Loading module T010_S
 Loading module T010_F
 Loading module T010

tests/modsys/functors/T017.icry.stdout

@@ -1,6 +1,6 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading interface module T017_F$interface
+Loading interface module `parameter` interface of T017_F
 Loading module T017_F
 Loading module T017_M
 Loading module T017

tests/modsys/functors/T018.icry.stdout

@@ -1,6 +1,6 @@
 Loading module Cryptol
 Loading module Cryptol
-Loading interface module T1$interface
+Loading interface module `parameter` interface of T1
 Loading module T1
 
 Expression depends on definitions from a parameterized module:

tests/modsys/functors/T019.icry.stdout

@@ -1,11 +1,11 @@
 Loading module Cryptol
 Loading module Cryptol
 Loading interface module T019::J
-Loading module T019::B$argument
+Loading module `where` argument of T019::B
 Loading interface module T019::I
 Loading module T019::A
 Loading module T019::B
 
 [error] at ./T019/B.cry:1:8--1:15
     • Expected a module
-    • `T019::B$argument` is a functor
+    • ``where` argument of T019::B` is a functor

tests/modsys/nested/T5.icry.stdout

@@ -3,10 +3,10 @@ Loading module Cryptol
 Loading module T4
 Loading module T5
 0x02
-Modules
-=======
+Submodules
+==========
     
-  submodule A
+  A
    
 Symbols
 =======

tests/modsys/nested/T6.icry.stdout

@@ -3,10 +3,10 @@ Loading module Cryptol
 Loading module T4
 Loading module T6
 
-Modules
-=======
+Submodules
+==========
     
-  submodule A
+  A
    
 Symbols
 =======