diff --git a/module/language/c/parser.mes b/module/language/c/parser.mes
index 35a49a93..9fe8fcd0 100644
--- a/module/language/c/parser.mes
+++ b/module/language/c/parser.mes
@@ -39,9 +39,7 @@
 
    (mes-use-module (srfi srfi-0))
 
-   (mes-use-module (mes psyntax-0))
-   (mes-use-module (mes psyntax-pp))
-   (mes-use-module (mes psyntax-1))
+   (mes-use-module (mes syntax))
 
    (mes-use-module (mes record-0))
    (mes-use-module (mes record))
diff --git a/module/language/paren.mes b/module/language/paren.mes
index 3430b085..1c0909dc 100644
--- a/module/language/paren.mes
+++ b/module/language/paren.mes
@@ -39,9 +39,7 @@
    (mes-use-module (mes quasiquote))
    (mes-use-module (mes let))
    (mes-use-module (mes scm))
-   (mes-use-module (mes psyntax-0))
-   (mes-use-module (mes psyntax-pp))
-   (mes-use-module (mes psyntax-1))
+   (mes-use-module (mes syntax))
    (mes-use-module (srfi srfi-0))
    (mes-use-module (mes record-0))
    (mes-use-module (mes record))
diff --git a/scripts/mescc.mes b/scripts/mescc.mes
index fe74f808..54a4dd08 100755
--- a/scripts/mescc.mes
+++ b/scripts/mescc.mes
@@ -38,9 +38,7 @@ exit $?
 (mes-use-module (mes quasiquote))
 (mes-use-module (mes let))
 (mes-use-module (mes scm))
-(mes-use-module (mes psyntax-0))
-(mes-use-module (mes psyntax-pp))
-(mes-use-module (mes psyntax-1))
+(mes-use-module (mes syntax))
 (mes-use-module (srfi srfi-0))
 (mes-use-module (mes record-0))
 (mes-use-module (mes record))
diff --git a/scripts/paren.mes b/scripts/paren.mes
index ce3bc70c..3f4e453c 100755
--- a/scripts/paren.mes
+++ b/scripts/paren.mes
@@ -39,9 +39,7 @@ exit $?
 (mes-use-module (mes quasiquote))
 (mes-use-module (mes let))
 (mes-use-module (mes scm))
-(mes-use-module (mes psyntax-0))
-(mes-use-module (mes psyntax-pp))
-(mes-use-module (mes psyntax-1))
+(mes-use-module (mes syntax))
 (mes-use-module (srfi srfi-0))
 (mes-use-module (mes record-0))
 (mes-use-module (mes record))
diff --git a/scripts/repl.mes b/scripts/repl.mes
index 933e4036..d8833117 100755
--- a/scripts/repl.mes
+++ b/scripts/repl.mes
@@ -31,9 +31,7 @@ exit $?
 (mes-use-module (mes let))
 (mes-use-module (mes scm))
 (mes-use-module (srfi srfi-0))
-(mes-use-module (mes psyntax-0))
-(mes-use-module (mes psyntax-pp))
-(mes-use-module (mes psyntax-1))
+(mes-use-module (mes syntax))
 (mes-use-module (mes match))
 (mes-use-module (mes repl))
 
diff --git a/tests/let-syntax.test b/tests/let-syntax.test
index bfa5440b..17420701 100755
--- a/tests/let-syntax.test
+++ b/tests/let-syntax.test
@@ -30,9 +30,7 @@ exit $?
 (mes-use-module (mes quasiquote))
 (mes-use-module (mes let))
 (mes-use-module (mes scm))
-(mes-use-module (mes psyntax-0))
-(mes-use-module (mes psyntax-pp))
-(mes-use-module (mes psyntax-1))
+(mes-use-module (mes syntax))
 (mes-use-module (mes test))
 
 (pass-if "first dummy" #t)
diff --git a/tests/match.test b/tests/match.test
index c1e9f985..10a4fccb 100755
--- a/tests/match.test
+++ b/tests/match.test
@@ -31,9 +31,7 @@ exit $?
 (mes-use-module (mes let))
 (mes-use-module (srfi srfi-0))
 (mes-use-module (mes scm))
-(mes-use-module (mes psyntax-0))
-(mes-use-module (mes psyntax-pp))
-(mes-use-module (mes psyntax-1))
+(mes-use-module (mes syntax))
 (mes-use-module (mes record-0))
 (mes-use-module (mes record))
 (mes-use-module (srfi srfi-9))
diff --git a/tests/record.test b/tests/record.test
index 9b872f6f..2c6930c9 100755
--- a/tests/record.test
+++ b/tests/record.test
@@ -31,9 +31,7 @@ exit $?
 (mes-use-module (mes let))
 (mes-use-module (srfi srfi-0))
 (mes-use-module (mes scm))
-(mes-use-module (mes psyntax-0))
-(mes-use-module (mes psyntax-pp))
-(mes-use-module (mes psyntax-1))
+(mes-use-module (mes syntax))
 (mes-use-module (mes record-0))
 (mes-use-module (mes record))
 (mes-use-module (srfi srfi-9))