diff --git a/cmd/super/ztests/single-arg-error.yaml b/cmd/super/ztests/single-arg-error.yaml
index bf7c292aea..3787b0f86e 100644
--- a/cmd/super/ztests/single-arg-error.yaml
+++ b/cmd/super/ztests/single-arg-error.yaml
@@ -4,6 +4,6 @@ script: |
 outputs:
   - name: stderr
     data: |
-      super: error parsing SuperPipe at line 1, column 26:
+      super: parse error at line 1, column 26:
       file sample.jsup | count(
                            === ^ ===
diff --git a/compiler/parser/api.go b/compiler/parser/api.go
index aa80af9dc9..72c1dcf0e1 100644
--- a/compiler/parser/api.go
+++ b/compiler/parser/api.go
@@ -59,7 +59,7 @@ func convertParseErrs(err error, files *srcfiles.List) error {
 		if !ok {
 			return err
 		}
-		files.AddError("error parsing SuperPipe", pe.pos.offset, -1)
+		files.AddError("parse error", pe.pos.offset, -1)
 	}
 	return nil
 }
diff --git a/compiler/parser/ztests/syntax-error.yaml b/compiler/parser/ztests/syntax-error.yaml
index 5d130af83d..091c594f8a 100644
--- a/compiler/parser/ztests/syntax-error.yaml
+++ b/compiler/parser/ztests/syntax-error.yaml
@@ -8,6 +8,6 @@ inputs:
 outputs:
   - name: stderr
     data: |
-      super: error parsing SuperPipe at line 1, column 12:
+      super: parse error at line 1, column 12:
       count() by ,x,y
              === ^ ===
diff --git a/docs/tutorials/schools.md b/docs/tutorials/schools.md
index d273afedde..890fd3aba8 100644
--- a/docs/tutorials/schools.md
+++ b/docs/tutorials/schools.md
@@ -235,7 +235,7 @@ super -z -c 'Defunct=' *.jsup
 ```
 produces
 ```mdtest-output
-super: error parsing SuperPipe at line 1, column 9:
+super: parse error at line 1, column 9:
 Defunct=
     === ^ ===
 ```
diff --git a/lake/ztests/query-parse-error.yaml b/lake/ztests/query-parse-error.yaml
index 86bc5b3da2..8728b1736c 100644
--- a/lake/ztests/query-parse-error.yaml
+++ b/lake/ztests/query-parse-error.yaml
@@ -34,34 +34,34 @@ outputs:
   - name: stderr
     data: |
       =1=
-      error parsing SuperPipe at line 1, column 12:
+      parse error at line 1, column 12:
       from test \ count()
              === ^ ===
       =2=
-      error parsing SuperPipe at line 2, column 7:
+      parse error at line 2, column 7:
       test \ count()
         === ^ ===
       =3=
-      error parsing SuperPipe at line 1, column 12:
+      parse error at line 1, column 12:
       from test \ count()
              === ^ ===
       =4=
-      error parsing SuperPipe at line 2, column 7:
+      parse error at line 2, column 7:
       test \ count()
         === ^ ===
       =5=
-      error parsing SuperPipe in bad-single-line.spq at line 1, column 12:
+      parse error in bad-single-line.spq at line 1, column 12:
       from test \ count()
              === ^ ===
       =6=
-      error parsing SuperPipe in bad-multiple-lines.spq at line 2, column 7:
+      parse error in bad-multiple-lines.spq at line 2, column 7:
       test \ count()
         === ^ ===
       =7=
-      error parsing SuperPipe in bad-single-line.spq at line 1, column 12:
+      parse error in bad-single-line.spq at line 1, column 12:
       from test \ count()
              === ^ ===
       =8=
-      error parsing SuperPipe in bad-multiple-lines.spq at line 2, column 7:
+      parse error in bad-multiple-lines.spq at line 2, column 7:
       test \ count()
         === ^ ===
diff --git a/service/ztests/compile.yaml b/service/ztests/compile.yaml
index bca7fb1909..c5f2cdd97b 100644
--- a/service/ztests/compile.yaml
+++ b/service/ztests/compile.yaml
@@ -8,4 +8,4 @@ inputs:
 outputs:
   - name: stdout
     data: |
-      {compilation_errors:[{Msg:"error parsing SuperPipe",Pos:6,End:-1}]}
+      {compilation_errors:[{Msg:"parse error",Pos:6,End:-1}]}
diff --git a/service/ztests/query-parse-error.yaml b/service/ztests/query-parse-error.yaml
index 1f5d1fed03..40433aa72d 100644
--- a/service/ztests/query-parse-error.yaml
+++ b/service/ztests/query-parse-error.yaml
@@ -34,34 +34,34 @@ outputs:
   - name: stderr
     data: |
       =1=
-      error parsing SuperPipe at line 1, column 12:
+      parse error at line 1, column 12:
       from test \ count()
              === ^ ===
       =2=
-      error parsing SuperPipe at line 2, column 7:
+      parse error at line 2, column 7:
       test \ count()
         === ^ ===
       =3=
-      error parsing SuperPipe at line 1, column 12:
+      parse error at line 1, column 12:
       from test \ count()
              === ^ ===
       =4=
-      error parsing SuperPipe at line 2, column 7:
+      parse error at line 2, column 7:
       test \ count()
         === ^ ===
       =5=
-      error parsing SuperPipe in bad-single-line.spq at line 1, column 12:
+      parse error in bad-single-line.spq at line 1, column 12:
       from test \ count()
              === ^ ===
       =6=
-      error parsing SuperPipe in bad-multiple-lines.spq at line 2, column 7:
+      parse error in bad-multiple-lines.spq at line 2, column 7:
       test \ count()
         === ^ ===
       =7=
-      error parsing SuperPipe in bad-single-line.spq at line 1, column 12:
+      parse error in bad-single-line.spq at line 1, column 12:
       from test \ count()
              === ^ ===
       =8=
-      error parsing SuperPipe in bad-multiple-lines.spq at line 2, column 7:
+      parse error in bad-multiple-lines.spq at line 2, column 7:
       test \ count()
         === ^ ===