diff --git a/src/lang/stmts/DefconsStmt.ts b/src/lang/stmts/Defcons.ts
similarity index 93%
rename from src/lang/stmts/DefconsStmt.ts
rename to src/lang/stmts/Defcons.ts
index 605e4d3f..e01de84a 100644
--- a/src/lang/stmts/DefconsStmt.ts
+++ b/src/lang/stmts/Defcons.ts
@@ -5,7 +5,7 @@ import { Span } from "../span"
 import { Stmt } from "../stmt"
 import { createTrivialTypes } from "../type"
 
-export class DefconsStmt implements Stmt {
+export class Defcons implements Stmt {
   constructor(
     public name: string,
     public inputArity: number,
diff --git a/src/lang/stmts/DefelimStmt.ts b/src/lang/stmts/Defelim.ts
similarity index 93%
rename from src/lang/stmts/DefelimStmt.ts
rename to src/lang/stmts/Defelim.ts
index b3e2b7fa..a50bc75a 100644
--- a/src/lang/stmts/DefelimStmt.ts
+++ b/src/lang/stmts/Defelim.ts
@@ -5,7 +5,7 @@ import { Span } from "../span"
 import { Stmt } from "../stmt"
 import { createTrivialTypes } from "../type"
 
-export class DefelimStmt implements Stmt {
+export class Defelim implements Stmt {
   constructor(
     public name: string,
     public inputArity: number,
diff --git a/src/lang/stmts/DefnetStmt.ts b/src/lang/stmts/Defnet.ts
similarity index 91%
rename from src/lang/stmts/DefnetStmt.ts
rename to src/lang/stmts/Defnet.ts
index 69f5f52c..75cc17db 100644
--- a/src/lang/stmts/DefnetStmt.ts
+++ b/src/lang/stmts/Defnet.ts
@@ -5,7 +5,7 @@ import { Span } from "../span"
 import { Stmt } from "../stmt"
 import { Word } from "../word"
 
-export class DefnetStmt implements Stmt {
+export class Defnet implements Stmt {
   constructor(
     public name: string,
     public words: Array<Word>,
diff --git a/src/lang/stmts/DefruleStmt.ts b/src/lang/stmts/Defrule.ts
similarity index 94%
rename from src/lang/stmts/DefruleStmt.ts
rename to src/lang/stmts/Defrule.ts
index b94af295..bf01e68e 100644
--- a/src/lang/stmts/DefruleStmt.ts
+++ b/src/lang/stmts/Defrule.ts
@@ -5,7 +5,7 @@ import { Span } from "../span"
 import { Stmt } from "../stmt"
 import { Word } from "../word"
 
-export class DefruleStmt implements Stmt {
+export class Defrule implements Stmt {
   constructor(
     public start: string,
     public end: string,
diff --git a/src/lang/stmts/index.ts b/src/lang/stmts/index.ts
index 7fc6c266..63ab3fe7 100644
--- a/src/lang/stmts/index.ts
+++ b/src/lang/stmts/index.ts
@@ -1,4 +1,4 @@
-export * from "./DefconsStmt"
-export * from "./DefelimStmt"
-export * from "./DefnetStmt"
-export * from "./DefruleStmt"
+export * from "./Defcons"
+export * from "./Defelim"
+export * from "./Defnet"
+export * from "./Defrule"
diff --git a/src/lang/syntax/matchStmt.ts b/src/lang/syntax/matchStmt.ts
index fbe6b30e..aaaf5932 100644
--- a/src/lang/syntax/matchStmt.ts
+++ b/src/lang/syntax/matchStmt.ts
@@ -16,7 +16,7 @@ export function matchStmt(sexp: Sexp): Stmt {
     [
       ["defcons", v("name"), v("inputArity"), v("outputArity")],
       ({ name, inputArity, outputArity }) =>
-        new Stmts.DefconsStmt(
+        new Stmts.Defcons(
           matchSymbol(name),
           matchNumber(inputArity),
           matchNumber(outputArity),
@@ -26,7 +26,7 @@ export function matchStmt(sexp: Sexp): Stmt {
     [
       ["defelim", v("name"), v("inputArity"), v("outputArity")],
       ({ name, inputArity, outputArity }) =>
-        new Stmts.DefelimStmt(
+        new Stmts.Defelim(
           matchSymbol(name),
           matchNumber(inputArity),
           matchNumber(outputArity),
@@ -36,12 +36,12 @@ export function matchStmt(sexp: Sexp): Stmt {
     [
       list(["defnet", v("name")], v("words")),
       ({ name, input, output, words }) =>
-        new Stmts.DefnetStmt(matchSymbol(name), matchExps(words), sexp.span),
+        new Stmts.Defnet(matchSymbol(name), matchExps(words), sexp.span),
     ],
     [
       list(["defrule", [v("start"), v("end")]], v("words")),
       ({ start, end, words }) =>
-        new Stmts.DefruleStmt(
+        new Stmts.Defrule(
           matchSymbol(start),
           matchSymbol(end),
           matchExps(words),