diff --git a/fec/tests/format/badfmta.fe b/fec/tests/format/bad_ari.fe
similarity index 80%
rename from fec/tests/format/badfmta.fe
rename to fec/tests/format/bad_ari.fe
index 01534cb..7dc30b8 100644
--- a/fec/tests/format/badfmta.fe
+++ b/fec/tests/format/bad_ari.fe
@@ -1,7 +1,6 @@
-unit badfmta;
+unit bad_ari;
 
 fn main() -> i32 {
     @print("{} {}", 1);
     return 0;
 }
-
diff --git a/fec/tests/format/badfbuf.fe b/fec/tests/format/bad_bufw.fe
similarity index 89%
rename from fec/tests/format/badfbuf.fe
rename to fec/tests/format/bad_bufw.fe
index 2267cb8..37bf521 100644
--- a/fec/tests/format/badfbuf.fe
+++ b/fec/tests/format/bad_bufw.fe
@@ -1,8 +1,7 @@
-unit badfbuf;
+unit bad_bufw;
 
 fn main() -> void {
     var raw: [4]u8 = [0, 0, 0, 0];
     var buf: []mut u8 = raw[..];
     let w = io.buf_writer(buf);
 }
-
diff --git a/fec/tests/format/badfcls.fe b/fec/tests/format/bad_cls.fe
similarity index 78%
rename from fec/tests/format/badfcls.fe
rename to fec/tests/format/bad_cls.fe
index 032d923..1f8a720 100644
--- a/fec/tests/format/badfcls.fe
+++ b/fec/tests/format/bad_cls.fe
@@ -1,7 +1,6 @@
-unit badfcls;
+unit bad_cls;
 
 fn main() -> i32 {
     @print("}", 1);
     return 0;
 }
-
diff --git a/fec/tests/format/badfmany.fe b/fec/tests/format/bad_many.fe
similarity index 78%
rename from fec/tests/format/badfmany.fe
rename to fec/tests/format/bad_many.fe
index 044e758..ab25401 100644
--- a/fec/tests/format/badfmany.fe
+++ b/fec/tests/format/bad_many.fe
@@ -1,7 +1,6 @@
-unit badfmany;
+unit bad_many;
 
 fn main() -> i32 {
     @print("{}", 1, 2);
     return 0;
 }
-
diff --git a/fec/tests/format/badfopen.fe b/fec/tests/format/bad_open.fe
similarity index 77%
rename from fec/tests/format/badfopen.fe
rename to fec/tests/format/bad_open.fe
index 6b32d2b..98ee2c8 100644
--- a/fec/tests/format/badfopen.fe
+++ b/fec/tests/format/bad_open.fe
@@ -1,7 +1,6 @@
-unit badfopen;
+unit bad_open;
 
 fn main() -> i32 {
     @print("{", 1);
     return 0;
 }
-
diff --git a/fec/tests/format/badfrun.fe b/fec/tests/format/bad_run.fe
similarity index 84%
rename from fec/tests/format/badfrun.fe
rename to fec/tests/format/bad_run.fe
index eed67b9..c7945e1 100644
--- a/fec/tests/format/badfrun.fe
+++ b/fec/tests/format/bad_run.fe
@@ -1,8 +1,7 @@
-unit badfrun;
+unit bad_run;
 
 fn main() -> i32 {
     var fmt: str = "{}";
     @print(fmt, 1);
     return 0;
 }
-
diff --git a/fec/tests/format/badftry.fe b/fec/tests/format/bad_try.fe
similarity index 80%
rename from fec/tests/format/badftry.fe
rename to fec/tests/format/bad_try.fe
index e3fb5f6..0c5da62 100644
--- a/fec/tests/format/badftry.fe
+++ b/fec/tests/format/bad_try.fe
@@ -1,7 +1,6 @@
-unit badftry;
+unit bad_try;
 
 fn main() -> i32 {
     try @print("nope");
     return 0;
 }
-
diff --git a/fec/tests/format/badftype.fe b/fec/tests/format/bad_type.fe
similarity index 87%
rename from fec/tests/format/badftype.fe
rename to fec/tests/format/bad_type.fe
index 72c4fbb..9279e47 100644
--- a/fec/tests/format/badftype.fe
+++ b/fec/tests/format/bad_type.fe
@@ -1,4 +1,4 @@
-unit badftype;
+unit bad_type;
 
 struct Point { x: i32, }
 
@@ -7,4 +7,3 @@ fn main() -> i32 {
     @print("{}", p);
     return 0;
 }
-
diff --git a/fec/tests/format/badfverb.fe b/fec/tests/format/bad_verb.fe
similarity index 78%
rename from fec/tests/format/badfverb.fe
rename to fec/tests/format/bad_verb.fe
index 51e5308..9a928ce 100644
--- a/fec/tests/format/badfverb.fe
+++ b/fec/tests/format/bad_verb.fe
@@ -1,7 +1,6 @@
-unit badfverb;
+unit bad_verb;
 
 fn main() -> i32 {
     @print("{q}", 1);
     return 0;
 }
-
diff --git a/fec/tests/format/badfwrit.fe b/fec/tests/format/bad_writ.fe
similarity index 83%
rename from fec/tests/format/badfwrit.fe
rename to fec/tests/format/bad_writ.fe
index f5f84a9..18e33a6 100644
--- a/fec/tests/format/badfwrit.fe
+++ b/fec/tests/format/bad_writ.fe
@@ -1,8 +1,7 @@
-unit badfwrit;
+unit bad_writ;
 
 fn main() -> i32 {
     var x: i32 = 0;
     @fprint(x, "bad");
     return 0;
 }
-
diff --git a/fec/tests/format/okfmt.fe b/fec/tests/format/ok_forma.fe
similarity index 98%
rename from fec/tests/format/okfmt.fe
rename to fec/tests/format/ok_forma.fe
index 5cde15b..a830b93 100644
--- a/fec/tests/format/okfmt.fe
+++ b/fec/tests/format/ok_forma.fe
@@ -1,4 +1,4 @@
-unit okfmt;
+unit ok_forma;
 
 const FMT: str = "n={} hex={x} c={c} s={s} b={b} {{ok}}\n";
 
@@ -28,4 +28,3 @@ fn main() -> i32 {
        buf5[0] == ('n' as u8) and buf5[2] == ('2' as u8) { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/format/okprop.fe b/fec/tests/format/ok_prop.fe
similarity index 84%
rename from fec/tests/format/okprop.fe
rename to fec/tests/format/ok_prop.fe
index 09bd3b0..49a0051 100644
--- a/fec/tests/format/okprop.fe
+++ b/fec/tests/format/ok_prop.fe
@@ -1,6 +1,5 @@
-unit okprop;
+unit ok_prop;
 
 pub fn propagate(w: io.Writer) -> !void {
     try @fprint(w, "a{}b", 1);
 }
-
diff --git a/fec/tests/format/oktryf.fe b/fec/tests/format/ok_try_f.fe
similarity index 91%
rename from fec/tests/format/oktryf.fe
rename to fec/tests/format/ok_try_f.fe
index 9dbb866..5429146 100644
--- a/fec/tests/format/oktryf.fe
+++ b/fec/tests/format/ok_try_f.fe
@@ -1,4 +1,4 @@
-unit oktryf;
+unit ok_try_f;
 
 fn main() -> !void {
     var raw: [4]u8 = [0, 0, 0, 0];
@@ -6,4 +6,3 @@ fn main() -> !void {
     let w: io.Writer = io.null_writer();
     try @fprint(w, "ok");
 }
-
diff --git a/fec/tests/optional/badcatc.fe b/fec/tests/optional/badcatch.fe
similarity index 92%
rename from fec/tests/optional/badcatc.fe
rename to fec/tests/optional/badcatch.fe
index 01966ee..97ed75c 100644
--- a/fec/tests/optional/badcatc.fe
+++ b/fec/tests/optional/badcatch.fe
@@ -1,5 +1,5 @@
 // ERROR:13:catch
-unit badcatc;
+unit badcatch;
 
 error E {
     Bad = 1,
@@ -15,4 +15,3 @@ fn bad() -> i32 {
     };
     return v;
 }
-
diff --git a/fec/tests/optional/baddefi.fe b/fec/tests/optional/baddef.fe
similarity index 89%
rename from fec/tests/optional/baddefi.fe
rename to fec/tests/optional/baddef.fe
index 2ce9671..2ff2b0f 100644
--- a/fec/tests/optional/baddefi.fe
+++ b/fec/tests/optional/baddef.fe
@@ -1,5 +1,5 @@
 // ERROR:13:type
-unit baddefi;
+unit baddef;
 
 error E {
     Bad = 1,
@@ -12,5 +12,3 @@ fn leaf() -> E!i32 {
 fn bad() -> i32 {
     return leaf() catch false;
 }
-
-
diff --git a/fec/tests/optional/badidir.fe b/fec/tests/optional/baddir.fe
similarity index 87%
rename from fec/tests/optional/badidir.fe
rename to fec/tests/optional/baddir.fe
index 6d4efde..46e0715 100644
--- a/fec/tests/optional/badidir.fe
+++ b/fec/tests/optional/baddir.fe
@@ -1,5 +1,5 @@
 // ERROR:9:optional
-unit badidir;
+unit baddir;
 
 struct Node {
     value: i32,
@@ -8,4 +8,3 @@ struct Node {
 fn bad(p: ?^Node) -> i32 {
     return p.^.value;
 }
-
diff --git a/fec/tests/optional/badecod.fe b/fec/tests/optional/badercod.fe
similarity index 80%
rename from fec/tests/optional/badecod.fe
rename to fec/tests/optional/badercod.fe
index 9f4e355..ad5b34c 100644
--- a/fec/tests/optional/badecod.fe
+++ b/fec/tests/optional/badercod.fe
@@ -1,8 +1,7 @@
 // ERROR:6:duplicate
-unit badecod;
+unit badercod;
 
 error E {
     One = 1,
     Two = 1,
 }
-
diff --git a/fec/tests/optional/badenam.fe b/fec/tests/optional/badernam.fe
similarity index 80%
rename from fec/tests/optional/badenam.fe
rename to fec/tests/optional/badernam.fe
index dc24789..661e8c0 100644
--- a/fec/tests/optional/badenam.fe
+++ b/fec/tests/optional/badernam.fe
@@ -1,8 +1,7 @@
 // ERROR:6:duplicate
-unit badenam;
+unit badernam;
 
 error E {
     One = 1,
     One = 2,
 }
-
diff --git a/fec/tests/optional/badetyp.fe b/fec/tests/optional/badetype.fe
similarity index 90%
rename from fec/tests/optional/badetyp.fe
rename to fec/tests/optional/badetype.fe
index d847230..af5bf39 100644
--- a/fec/tests/optional/badetyp.fe
+++ b/fec/tests/optional/badetype.fe
@@ -1,5 +1,5 @@
 // ERROR:17:error
-unit badetyp;
+unit badetype;
 
 error A {
     Bad = 1,
@@ -16,5 +16,3 @@ fn leaf() -> A!i32 {
 fn bad() -> B!i32 {
     return try leaf();
 }
-
-
diff --git a/fec/tests/optional/badnullv.fe b/fec/tests/optional/badnull.fe
similarity index 76%
rename from fec/tests/optional/badnullv.fe
rename to fec/tests/optional/badnull.fe
index d2ffae9..4ed896b 100644
--- a/fec/tests/optional/badnullv.fe
+++ b/fec/tests/optional/badnull.fe
@@ -1,8 +1,6 @@
 // ERROR:5:null
-unit badnullv;
+unit badnull;
 
 fn bad() -> void {
     let p = null;
 }
-
-
diff --git a/fec/tests/optional/badorefv.fe b/fec/tests/optional/badoref.fe
similarity index 76%
rename from fec/tests/optional/badorefv.fe
rename to fec/tests/optional/badoref.fe
index 150e1c6..641206e 100644
--- a/fec/tests/optional/badorefv.fe
+++ b/fec/tests/optional/badoref.fe
@@ -1,8 +1,6 @@
 // ERROR:5:reference
-unit badorefv;
+unit badoref;
 
 struct Bad {
     value: ?&i32,
 }
-
-
diff --git a/fec/tests/optional/badorlx.fe b/fec/tests/optional/badorel.fe
similarity index 89%
rename from fec/tests/optional/badorlx.fe
rename to fec/tests/optional/badorel.fe
index 56c3b6a..3a79145 100644
--- a/fec/tests/optional/badorlx.fe
+++ b/fec/tests/optional/badorel.fe
@@ -1,5 +1,5 @@
 // ERROR:9:non-Copy
-unit badorlx;
+unit badorel;
 
 struct Node {
     next: ?^Node,
@@ -8,5 +8,3 @@ struct Node {
 fn bad(p: ^Node, fallback: ^Node) -> ^Node {
     return p.next orelse fallback;
 }
-
-
diff --git a/fec/tests/optional/badprjv.fe b/fec/tests/optional/badproj.fe
similarity index 88%
rename from fec/tests/optional/badprjv.fe
rename to fec/tests/optional/badproj.fe
index 24525d2..a7d987c 100644
--- a/fec/tests/optional/badprjv.fe
+++ b/fec/tests/optional/badproj.fe
@@ -1,5 +1,5 @@
 // ERROR:9:mem.replace
-unit badprjv;
+unit badproj;
 
 struct Node {
     next: ?^Node,
@@ -9,5 +9,3 @@ fn bad(p: ^Node) -> void {
     let q = p.next;
     mem.destroy(p);
 }
-
-
diff --git a/fec/tests/optional/badqmkv.fe b/fec/tests/optional/badqmark.fe
similarity index 82%
rename from fec/tests/optional/badqmkv.fe
rename to fec/tests/optional/badqmark.fe
index 183a5d2..36cdc7b 100644
--- a/fec/tests/optional/badqmkv.fe
+++ b/fec/tests/optional/badqmark.fe
@@ -1,9 +1,7 @@
 // ERROR:6:optional
-unit badqmkv;
+unit badqmark;
 
 fn bad() -> i32 {
     let x: i32 = 1;
     return x.?;
 }
-
-
diff --git a/fec/tests/optional/badrett.fe b/fec/tests/optional/badret.fe
similarity index 88%
rename from fec/tests/optional/badrett.fe
rename to fec/tests/optional/badret.fe
index adab03a..84842e2 100644
--- a/fec/tests/optional/badrett.fe
+++ b/fec/tests/optional/badret.fe
@@ -1,5 +1,5 @@
 // ERROR:13:error
-unit badrett;
+unit badret;
 
 error A {
     Bad = 1,
@@ -12,4 +12,3 @@ error B {
 fn bad() -> B!i32 {
     return A.Bad;
 }
-
diff --git a/fec/tests/optional/badsomev.fe b/fec/tests/optional/badsome.fe
similarity index 80%
rename from fec/tests/optional/badsomev.fe
rename to fec/tests/optional/badsome.fe
index f12958c..f35a461 100644
--- a/fec/tests/optional/badsomev.fe
+++ b/fec/tests/optional/badsome.fe
@@ -1,9 +1,7 @@
 // ERROR:5:Some
-unit badsomev;
+unit badsome;
 
 fn bad() -> i32 {
     let x = Some(1);
     return x;
 }
-
-
diff --git a/fec/tests/optional/badtryx.fe b/fec/tests/optional/badtry.fe
similarity index 88%
rename from fec/tests/optional/badtryx.fe
rename to fec/tests/optional/badtry.fe
index bd5ee9b..a41273e 100644
--- a/fec/tests/optional/badtryx.fe
+++ b/fec/tests/optional/badtry.fe
@@ -1,5 +1,5 @@
 // ERROR:13:try
-unit badtryx;
+unit badtry;
 
 error E {
     Bad = 1,
@@ -12,5 +12,3 @@ fn leaf() -> E!i32 {
 fn bad() -> i32 {
     return try leaf();
 }
-
-
diff --git a/fec/tests/optional/badzero1.fe b/fec/tests/optional/badzero.fe
similarity index 70%
rename from fec/tests/optional/badzero1.fe
rename to fec/tests/optional/badzero.fe
index b51d040..da86afb 100644
--- a/fec/tests/optional/badzero1.fe
+++ b/fec/tests/optional/badzero.fe
@@ -1,8 +1,6 @@
 // ERROR:5:0
-unit badzero1;
+unit badzero;
 
 error E {
     Zero = 0,
 }
-
-
diff --git a/fec/tests/optional/okcatc.fe b/fec/tests/optional/okcatch.fe
similarity index 92%
rename from fec/tests/optional/okcatc.fe
rename to fec/tests/optional/okcatch.fe
index 13aa727..557fd12 100644
--- a/fec/tests/optional/okcatc.fe
+++ b/fec/tests/optional/okcatch.fe
@@ -1,4 +1,4 @@
-unit okcatc;
+unit okcatch;
 
 error E {
     Bad = 1,
@@ -14,4 +14,3 @@ fn top() -> E!i32 {
     };
     return v;
 }
-
diff --git a/fec/tests/optional/okcatmv.fe b/fec/tests/optional/okcatmov.fe
similarity index 90%
rename from fec/tests/optional/okcatmv.fe
rename to fec/tests/optional/okcatmov.fe
index 9cdc393..c2c7b37 100644
--- a/fec/tests/optional/okcatmv.fe
+++ b/fec/tests/optional/okcatmov.fe
@@ -1,4 +1,4 @@
-unit okcatmv;
+unit okcatmov;
 
 error E { Bad = 1, }
 struct Node { value: i32, }
@@ -6,4 +6,3 @@ struct Node { value: i32, }
 fn recover(result: E!^Node, fallback: ^Node) -> ^Node {
     return result catch fallback;
 }
-
diff --git a/fec/tests/optional/okcvd.fe b/fec/tests/optional/okcvoid.fe
similarity index 90%
rename from fec/tests/optional/okcvd.fe
rename to fec/tests/optional/okcvoid.fe
index 1fab046..4c1c2ab 100644
--- a/fec/tests/optional/okcvd.fe
+++ b/fec/tests/optional/okcvoid.fe
@@ -1,4 +1,4 @@
-unit okcvd;
+unit okcvoid;
 
 error E {
     Bad = 1,
@@ -13,4 +13,3 @@ fn top() -> void {
         return;
     };
 }
-
diff --git a/fec/tests/optional/okdefl.fe b/fec/tests/optional/okdeflt.fe
similarity index 89%
rename from fec/tests/optional/okdefl.fe
rename to fec/tests/optional/okdeflt.fe
index b5fa8a6..b62d66c 100644
--- a/fec/tests/optional/okdefl.fe
+++ b/fec/tests/optional/okdeflt.fe
@@ -1,4 +1,4 @@
-unit okdefl;
+unit okdeflt;
 
 error E {
     Bad = 1,
@@ -11,4 +11,3 @@ fn leaf() -> E!i32 {
 fn top() -> i32 {
     return leaf() catch 11;
 }
-
diff --git a/fec/tests/optional/okiflt.fe b/fec/tests/optional/okiflet.fe
similarity index 86%
rename from fec/tests/optional/okiflt.fe
rename to fec/tests/optional/okiflet.fe
index 7d9d14c..3192c4b 100644
--- a/fec/tests/optional/okiflt.fe
+++ b/fec/tests/optional/okiflet.fe
@@ -1,4 +1,4 @@
-unit okiflt;
+unit okiflet;
 
 fn value(p: ?i32) -> i32 {
     if let Some(v) = p {
@@ -6,5 +6,3 @@ fn value(p: ?i32) -> i32 {
     }
     return 0;
 }
-
-
diff --git a/fec/tests/optional/okmtch.fe b/fec/tests/optional/okmatch.fe
similarity index 88%
rename from fec/tests/optional/okmtch.fe
rename to fec/tests/optional/okmatch.fe
index 6cfaa8d..6335cff 100644
--- a/fec/tests/optional/okmtch.fe
+++ b/fec/tests/optional/okmatch.fe
@@ -1,4 +1,4 @@
-unit okmtch;
+unit okmatch;
 
 fn value(p: ?i32) -> i32 {
     match p {
@@ -6,5 +6,3 @@ fn value(p: ?i32) -> i32 {
         None => { return 0; }
     }
 }
-
-
diff --git a/fec/tests/optional/oknull1.fe b/fec/tests/optional/oknull.fe
similarity index 90%
rename from fec/tests/optional/oknull1.fe
rename to fec/tests/optional/oknull.fe
index ce22d95..c12a917 100644
--- a/fec/tests/optional/oknull1.fe
+++ b/fec/tests/optional/oknull.fe
@@ -1,4 +1,4 @@
-unit oknull1;
+unit oknull;
 
 struct Node { value: i32, }
 
@@ -8,5 +8,3 @@ fn test() -> bool {
     let p: ?^Node = null;
     return accepts(p);
 }
-
-
diff --git a/fec/tests/optional/okorel.fe b/fec/tests/optional/okorelse.fe
similarity index 77%
rename from fec/tests/optional/okorel.fe
rename to fec/tests/optional/okorelse.fe
index f49a0f5..9ff537e 100644
--- a/fec/tests/optional/okorel.fe
+++ b/fec/tests/optional/okorelse.fe
@@ -1,6 +1,5 @@
-unit okorel;
+unit okorelse;
 
 fn value(p: ?i32) -> i32 {
     return p orelse 9;
 }
-
diff --git a/fec/tests/optional/okptvw.fe b/fec/tests/optional/okpatvw.fe
similarity index 93%
rename from fec/tests/optional/okptvw.fe
rename to fec/tests/optional/okpatvw.fe
index a046b5e..5797b46 100644
--- a/fec/tests/optional/okptvw.fe
+++ b/fec/tests/optional/okpatvw.fe
@@ -1,4 +1,4 @@
-unit okptvw;
+unit okpatvw;
 
 struct Node { value: i32, }
 
@@ -10,5 +10,3 @@ fn keep(p: ?^Node) -> void {
     let owned = mem.replace(&mut slot, null).?;
     mem.destroy(owned);
 }
-
-
diff --git a/fec/tests/optional/okproj1.fe b/fec/tests/optional/okproj.fe
similarity index 84%
rename from fec/tests/optional/okproj1.fe
rename to fec/tests/optional/okproj.fe
index 4bcca85..f54768a 100644
--- a/fec/tests/optional/okproj1.fe
+++ b/fec/tests/optional/okproj.fe
@@ -1,4 +1,4 @@
-unit okproj1;
+unit okproj;
 
 struct Node {
     value: i32,
@@ -7,5 +7,3 @@ struct Node {
 fn touch(p: ?&mut Node) -> void {
     p.?.value = 7;
 }
-
-
diff --git a/fec/tests/optional/okrepl2.fe b/fec/tests/optional/okrepl.fe
similarity index 90%
rename from fec/tests/optional/okrepl2.fe
rename to fec/tests/optional/okrepl.fe
index 1bab0bd..2710132 100644
--- a/fec/tests/optional/okrepl2.fe
+++ b/fec/tests/optional/okrepl.fe
@@ -1,4 +1,4 @@
-unit okrepl2;
+unit okrepl;
 
 struct Node {
     value: i32,
@@ -9,5 +9,3 @@ fn take(p: ?^Node) -> void {
     let n = mem.replace(&mut q, null).?;
     mem.destroy(n);
 }
-
-
diff --git a/fec/tests/optional/oktrd2.fe b/fec/tests/optional/oktrdef.fe
similarity index 90%
rename from fec/tests/optional/oktrd2.fe
rename to fec/tests/optional/oktrdef.fe
index f0361df..1b0831c 100644
--- a/fec/tests/optional/oktrd2.fe
+++ b/fec/tests/optional/oktrdef.fe
@@ -1,4 +1,4 @@
-unit oktrd2;
+unit oktrdef;
 
 error E {
     Bad = 1,
@@ -12,5 +12,3 @@ fn top() -> E!i32 {
     defer { let x: i32 = 1; }
     return try leaf();
 }
-
-
diff --git a/fec/tests/optional/oktry2.fe b/fec/tests/optional/oktry.fe
similarity index 90%
rename from fec/tests/optional/oktry2.fe
rename to fec/tests/optional/oktry.fe
index 6140223..f0066db 100644
--- a/fec/tests/optional/oktry2.fe
+++ b/fec/tests/optional/oktry.fe
@@ -1,4 +1,4 @@
-unit oktry2;
+unit oktry;
 
 error E {
     Bad = 1,
@@ -12,5 +12,3 @@ fn leaf(ok: bool) -> E!i32 {
 fn top() -> E!i32 {
     return try leaf(true);
 }
-
-
diff --git a/fec/tests/own/badclos.fe b/fec/tests/own/bad_clos.fe
similarity index 94%
rename from fec/tests/own/badclos.fe
rename to fec/tests/own/bad_clos.fe
index 447c0f6..28ff3e4 100644
--- a/fec/tests/own/badclos.fe
+++ b/fec/tests/own/bad_clos.fe
@@ -1,4 +1,4 @@
-unit badclos;
+unit bad_clos;
 
 struct FileLike {
     handle: i32,
@@ -11,4 +11,3 @@ fn bad() -> !void {
     try file.close();
     file.close();
 }
-
diff --git a/fec/tests/own/badcond.fe b/fec/tests/own/bad_cond.fe
similarity index 89%
rename from fec/tests/own/badcond.fe
rename to fec/tests/own/bad_cond.fe
index 2f5916d..f46cfe4 100644
--- a/fec/tests/own/badcond.fe
+++ b/fec/tests/own/bad_cond.fe
@@ -1,4 +1,4 @@
-unit badcond;
+unit bad_cond;
 
 fn take(p: ^i32) -> void { mem.destroy(p); }
 
@@ -6,4 +6,3 @@ fn bad(p: ^i32, flag: bool) -> void {
     if flag { take(p); }
     p.^ = 3;
 }
-
diff --git a/fec/tests/own/baddbl.fe b/fec/tests/own/bad_dbl.fe
similarity index 83%
rename from fec/tests/own/baddbl.fe
rename to fec/tests/own/bad_dbl.fe
index 84f3912..a990673 100644
--- a/fec/tests/own/baddbl.fe
+++ b/fec/tests/own/bad_dbl.fe
@@ -1,7 +1,6 @@
-unit baddbl;
+unit bad_dbl;
 
 fn bad(p: ^i32) -> void {
     mem.destroy(p);
     mem.destroy(p);
 }
-
diff --git a/fec/tests/own/baddest.fe b/fec/tests/own/bad_dest.fe
similarity index 76%
rename from fec/tests/own/baddest.fe
rename to fec/tests/own/bad_dest.fe
index 11d462b..8cedd19 100644
--- a/fec/tests/own/baddest.fe
+++ b/fec/tests/own/bad_dest.fe
@@ -1,6 +1,5 @@
-unit baddest;
+unit bad_dest;
 
 fn bad(x: i32) -> void {
     mem.destroy(x);
 }
-
diff --git a/fec/tests/own/baddrop.fe b/fec/tests/own/bad_drop.fe
similarity index 90%
rename from fec/tests/own/baddrop.fe
rename to fec/tests/own/bad_drop.fe
index 5a4e74d..ad9e9cc 100644
--- a/fec/tests/own/baddrop.fe
+++ b/fec/tests/own/bad_drop.fe
@@ -1,4 +1,4 @@
-unit baddrop;
+unit bad_drop;
 
 struct Box {
     value: i32,
@@ -9,4 +9,3 @@ fn bad() -> void {
     var b: Box = Box{ value: 1 };
     b.drop();
 }
-
diff --git a/fec/tests/own/badlop1.fe b/fec/tests/own/bad_loop.fe
similarity index 88%
rename from fec/tests/own/badlop1.fe
rename to fec/tests/own/bad_loop.fe
index 7dc06ff..c7fd822 100644
--- a/fec/tests/own/badlop1.fe
+++ b/fec/tests/own/bad_loop.fe
@@ -1,8 +1,7 @@
-unit badlop1;
+unit bad_loop;
 
 fn take(p: ^i32) -> void { mem.destroy(p); }
 
 fn bad(p: ^i32, again: bool) -> void {
     while again { take(p); }
 }
-
diff --git a/fec/tests/own/badmv1.fe b/fec/tests/own/bad_move.fe
similarity index 87%
rename from fec/tests/own/badmv1.fe
rename to fec/tests/own/bad_move.fe
index 8f53bcc..15d25fb 100644
--- a/fec/tests/own/badmv1.fe
+++ b/fec/tests/own/bad_move.fe
@@ -1,4 +1,4 @@
-unit badmv1;
+unit bad_move;
 
 fn take(p: ^i32) -> void { mem.destroy(p); }
 
@@ -6,4 +6,3 @@ fn twice(p: ^i32) -> void {
     take(p);
     take(p);
 }
-
diff --git a/fec/tests/own/badproj.fe b/fec/tests/own/bad_proj.fe
similarity index 88%
rename from fec/tests/own/badproj.fe
rename to fec/tests/own/bad_proj.fe
index e756adf..0c50987 100644
--- a/fec/tests/own/badproj.fe
+++ b/fec/tests/own/bad_proj.fe
@@ -1,4 +1,4 @@
-unit badproj;
+unit bad_proj;
 
 struct Holder { p: ^i32 }
 fn take(p: ^i32) -> void { mem.destroy(p); }
@@ -6,4 +6,3 @@ fn take(p: ^i32) -> void { mem.destroy(p); }
 fn bad(h: Holder) -> void {
     take(h.p);
 }
-
diff --git a/fec/tests/own/badargu.fe b/fec/tests/own/badarg.fe
similarity index 90%
rename from fec/tests/own/badargu.fe
rename to fec/tests/own/badarg.fe
index 55d092d..7e50114 100644
--- a/fec/tests/own/badargu.fe
+++ b/fec/tests/own/badarg.fe
@@ -1,5 +1,5 @@
 // ERROR:8:derived from a parameter
-unit badargu;
+unit badarg;
 
 struct Box {
     value: i32,
@@ -8,5 +8,3 @@ struct Box {
         return other;
     }
 }
-
-
diff --git a/fec/tests/own/badinit.fe b/fec/tests/own/badbinit.fe
similarity index 90%
rename from fec/tests/own/badinit.fe
rename to fec/tests/own/badbinit.fe
index 049641b..b6eb632 100644
--- a/fec/tests/own/badinit.fe
+++ b/fec/tests/own/badbinit.fe
@@ -1,5 +1,5 @@
 // ERROR:9:initialized
-unit badinit;
+unit badbinit;
 
 fn bad(assign: bool) -> i32 {
     var value: i32;
@@ -8,4 +8,3 @@ fn bad(assign: bool) -> i32 {
     }
     return value;
 }
-
diff --git a/fec/tests/own/badbrmv.fe b/fec/tests/own/badbrmov.fe
similarity index 89%
rename from fec/tests/own/badbrmv.fe
rename to fec/tests/own/badbrmov.fe
index d0fc104..f07825d 100644
--- a/fec/tests/own/badbrmv.fe
+++ b/fec/tests/own/badbrmov.fe
@@ -1,5 +1,5 @@
 // ERROR:8:move
-unit badbrmv;
+unit badbrmov;
 
 fn bad(p: ^i32, consume: bool) -> void {
     if consume {
@@ -7,4 +7,3 @@ fn bad(p: ^i32, consume: bool) -> void {
     }
     mem.destroy(p);
 }
-
diff --git a/fec/tests/own/baddefr.fe b/fec/tests/own/baddefer.fe
similarity index 92%
rename from fec/tests/own/baddefr.fe
rename to fec/tests/own/baddefer.fe
index 47a991f..faf7839 100644
--- a/fec/tests/own/baddefr.fe
+++ b/fec/tests/own/baddefer.fe
@@ -1,5 +1,5 @@
 // ERROR:10:borrow
-unit baddefr;
+unit baddefer;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -10,4 +10,3 @@ fn bad() -> i32 {
     x = 1;
     return x;
 }
-
diff --git a/fec/tests/own/badfmem.fe b/fec/tests/own/badfld.fe
similarity index 78%
rename from fec/tests/own/badfmem.fe
rename to fec/tests/own/badfld.fe
index 71eec2c..d4090ff 100644
--- a/fec/tests/own/badfmem.fe
+++ b/fec/tests/own/badfld.fe
@@ -1,7 +1,6 @@
 // ERROR:5:reference
-unit badfmem;
+unit badfld;
 
 struct Bad {
     value: &i32,
 }
-
diff --git a/fec/tests/own/badglobx.fe b/fec/tests/own/badglob.fe
similarity index 84%
rename from fec/tests/own/badglobx.fe
rename to fec/tests/own/badglob.fe
index 3afdcc9..41a107c 100644
--- a/fec/tests/own/badglobx.fe
+++ b/fec/tests/own/badglob.fe
@@ -1,5 +1,5 @@
 // ERROR:7:global
-unit badglobx;
+unit badglob;
 
 var VALUE: i32 = 0;
 
@@ -7,5 +7,3 @@ fn bad() -> i32 {
     let r = &VALUE;
     return r.^;
 }
-
-
diff --git a/fec/tests/own/badinvr.fe b/fec/tests/own/badinv.fe
similarity index 88%
rename from fec/tests/own/badinvr.fe
rename to fec/tests/own/badinv.fe
index 3338eed..88f483c 100644
--- a/fec/tests/own/badinvr.fe
+++ b/fec/tests/own/badinv.fe
@@ -1,5 +1,5 @@
 // ERROR:6:borrow
-unit badinvr;
+unit badinv;
 
 fn bad(p: ^i32, q: ^i32) -> void {
     let r = &p;
@@ -7,5 +7,3 @@ fn bad(p: ^i32, q: ^i32) -> void {
     let keep = r;
     mem.destroy(p);
 }
-
-
diff --git a/fec/tests/own/badlp2.fe b/fec/tests/own/badloop.fe
similarity index 90%
rename from fec/tests/own/badlp2.fe
rename to fec/tests/own/badloop.fe
index 0d403b6..1cb6a4f 100644
--- a/fec/tests/own/badlp2.fe
+++ b/fec/tests/own/badloop.fe
@@ -1,5 +1,5 @@
 // ERROR:6:move
-unit badlp2;
+unit badloop;
 
 fn bad(p: ^i32, again: bool) -> void {
     while again {
@@ -7,4 +7,3 @@ fn bad(p: ^i32, again: bool) -> void {
     }
     mem.destroy(p);
 }
-
diff --git a/fec/tests/own/badmv2.fe b/fec/tests/own/badmove.fe
similarity index 90%
rename from fec/tests/own/badmv2.fe
rename to fec/tests/own/badmove.fe
index da71598..e746062 100644
--- a/fec/tests/own/badmv2.fe
+++ b/fec/tests/own/badmove.fe
@@ -1,5 +1,5 @@
 // ERROR:8:borrow
-unit badmv2;
+unit badmove;
 
 fn take(p: ^i32) -> void { mem.destroy(p); }
 
@@ -8,4 +8,3 @@ fn bad(p: ^i32) -> void {
     take(p);
     let q = r;
 }
-
diff --git a/fec/tests/own/badmutv.fe b/fec/tests/own/badmut.fe
similarity index 87%
rename from fec/tests/own/badmutv.fe
rename to fec/tests/own/badmut.fe
index 95741c0..90aab1f 100644
--- a/fec/tests/own/badmutv.fe
+++ b/fec/tests/own/badmut.fe
@@ -1,5 +1,5 @@
 // ERROR:7:borrow
-unit badmutv;
+unit badmut;
 
 fn bad() -> i32 {
     var x: i32 = 0;
@@ -8,5 +8,3 @@ fn bad() -> i32 {
     r.^ = 2;
     return x;
 }
-
-
diff --git a/fec/tests/own/badmutx.fe b/fec/tests/own/badmut2.fe
similarity index 89%
rename from fec/tests/own/badmutx.fe
rename to fec/tests/own/badmut2.fe
index 34fa6e9..790e251 100644
--- a/fec/tests/own/badmutx.fe
+++ b/fec/tests/own/badmut2.fe
@@ -1,5 +1,5 @@
 // ERROR:7:borrow
-unit badmutx;
+unit badmut2;
 
 fn bad() -> i32 {
     var x: i32 = 0;
@@ -9,5 +9,3 @@ fn bad() -> i32 {
     b.^ = 2;
     return x;
 }
-
-
diff --git a/fec/tests/own/badptrx.fe b/fec/tests/own/badptr.fe
similarity index 79%
rename from fec/tests/own/badptrx.fe
rename to fec/tests/own/badptr.fe
index 1426db3..36e9490 100644
--- a/fec/tests/own/badptrx.fe
+++ b/fec/tests/own/badptr.fe
@@ -1,8 +1,6 @@
 // ERROR:4:reference
-unit badptrx;
+unit badptr;
 
 fn bad(p: *&i32) -> void {
     return;
 }
-
-
diff --git a/fec/tests/own/badretv.fe b/fec/tests/own/badret.fe
similarity index 83%
rename from fec/tests/own/badretv.fe
rename to fec/tests/own/badret.fe
index 774a760..5a9a777 100644
--- a/fec/tests/own/badretv.fe
+++ b/fec/tests/own/badret.fe
@@ -1,8 +1,7 @@
 // ERROR:6:reference
-unit badretv;
+unit badret;
 
 fn bad() -> &i32 {
     let x: i32 = 1;
     return &x;
 }
-
diff --git a/fec/tests/own/badrfie.fe b/fec/tests/own/badrfld.fe
similarity index 90%
rename from fec/tests/own/badrfie.fe
rename to fec/tests/own/badrfld.fe
index fd366aa..65cb8b0 100644
--- a/fec/tests/own/badrfie.fe
+++ b/fec/tests/own/badrfld.fe
@@ -1,5 +1,5 @@
 // ERROR:9:borrow
-unit badrfie;
+unit badrfld;
 
 struct Pair { a: i32, b: i32, }
 
@@ -9,5 +9,3 @@ fn bad() -> void {
     p.b = 3;
     left.^ = 4;
 }
-
-
diff --git a/fec/tests/own/badri2.fe b/fec/tests/own/badridx.fe
similarity index 90%
rename from fec/tests/own/badri2.fe
rename to fec/tests/own/badridx.fe
index a6987b3..d7597c5 100644
--- a/fec/tests/own/badri2.fe
+++ b/fec/tests/own/badridx.fe
@@ -1,5 +1,5 @@
 // ERROR:7:borrow
-unit badri2;
+unit badridx;
 
 fn bad() -> void {
     var xs: [2]i32 = [1, 2];
@@ -8,5 +8,3 @@ fn bad() -> void {
     a.^ = 3;
     b.^ = 4;
 }
-
-
diff --git a/fec/tests/own/badscp1.fe b/fec/tests/own/badscop.fe
similarity index 92%
rename from fec/tests/own/badscp1.fe
rename to fec/tests/own/badscop.fe
index a7893fe..3bbeded 100644
--- a/fec/tests/own/badscp1.fe
+++ b/fec/tests/own/badscop.fe
@@ -1,5 +1,5 @@
 // ERROR:9:reference
-unit badscp1;
+unit badscop;
 
 fn bad(cond: bool) -> i32 {
     let outer: i32 = 0;
@@ -10,5 +10,3 @@ fn bad(cond: bool) -> i32 {
     }
     return r.^;
 }
-
-
diff --git a/fec/tests/own/badselfw.fe b/fec/tests/own/badself.fe
similarity index 87%
rename from fec/tests/own/badselfw.fe
rename to fec/tests/own/badself.fe
index 2e2795d..fe80c84 100644
--- a/fec/tests/own/badselfw.fe
+++ b/fec/tests/own/badself.fe
@@ -1,5 +1,5 @@
 // ERROR:8:self
-unit badselfw;
+unit badself;
 
 struct Box {
     value: i32,
@@ -8,5 +8,3 @@ struct Box {
         return &self.value;
     }
 }
-
-
diff --git a/fec/tests/own/badshw1.fe b/fec/tests/own/badshwr.fe
similarity index 90%
rename from fec/tests/own/badshw1.fe
rename to fec/tests/own/badshwr.fe
index c1c2d11..015d14f 100644
--- a/fec/tests/own/badshw1.fe
+++ b/fec/tests/own/badshwr.fe
@@ -1,5 +1,5 @@
 // ERROR:9:borrow
-unit badshw1;
+unit badshwr;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -9,5 +9,3 @@ fn bad() -> i32 {
     x = 1;
     return read(r);
 }
-
-
diff --git a/fec/tests/own/badtwo2.fe b/fec/tests/own/badtwo.fe
similarity index 82%
rename from fec/tests/own/badtwo2.fe
rename to fec/tests/own/badtwo.fe
index 431f7e9..dcdfa0e 100644
--- a/fec/tests/own/badtwo2.fe
+++ b/fec/tests/own/badtwo.fe
@@ -1,8 +1,6 @@
 // ERROR:5:reference
-unit badtwo2;
+unit badtwo;
 
 fn choose(a: &i32, b: &i32) -> &i32 {
     return a;
 }
-
-
diff --git a/fec/tests/own/badup1.fe b/fec/tests/own/badup.fe
similarity index 89%
rename from fec/tests/own/badup1.fe
rename to fec/tests/own/badup.fe
index a7b363c..34f2b7e 100644
--- a/fec/tests/own/badup1.fe
+++ b/fec/tests/own/badup.fe
@@ -1,5 +1,5 @@
 // ERROR:8:mut
-unit badup1;
+unit badup;
 
 struct Box {
     value: i32,
@@ -8,5 +8,3 @@ struct Box {
         return &mut self.value;
     }
 }
-
-
diff --git a/fec/tests/own/badweak2.fe b/fec/tests/own/badweak.fe
similarity index 87%
rename from fec/tests/own/badweak2.fe
rename to fec/tests/own/badweak.fe
index 645e3fa..8da6bc8 100644
--- a/fec/tests/own/badweak2.fe
+++ b/fec/tests/own/badweak.fe
@@ -1,5 +1,5 @@
 // ERROR:7:mut
-unit badweak2;
+unit badweak;
 
 fn bad() -> void {
     var x: i32 = 0;
@@ -7,5 +7,3 @@ fn bad() -> void {
     let s: &i32 = m;
     let v = s.^;
 }
-
-
diff --git a/fec/tests/own/okdefer1.fe b/fec/tests/own/ok_defer.fe
similarity index 80%
rename from fec/tests/own/okdefer1.fe
rename to fec/tests/own/ok_defer.fe
index 518a806..e4e2fef 100644
--- a/fec/tests/own/okdefer1.fe
+++ b/fec/tests/own/ok_defer.fe
@@ -1,6 +1,5 @@
-unit okdefer1;
+unit ok_defer;
 
 pub fn cleanup(p: ^i32) -> void {
     defer { mem.destroy(p); }
 }
-
diff --git a/fec/tests/own/okowned.fe b/fec/tests/own/ok_owned.fe
similarity index 91%
rename from fec/tests/own/okowned.fe
rename to fec/tests/own/ok_owned.fe
index 96581e5..2881628 100644
--- a/fec/tests/own/okowned.fe
+++ b/fec/tests/own/ok_owned.fe
@@ -1,4 +1,4 @@
-unit okowned;
+unit ok_owned;
 
 fn main() -> !void {
     var p: ^i32 = try mem.create(0);
@@ -7,4 +7,3 @@ fn main() -> !void {
     let value: i32 = p.^;
     defer { mem.destroy(p); }
 }
-
diff --git a/fec/tests/own/okbrch.fe b/fec/tests/own/okbranch.fe
similarity index 93%
rename from fec/tests/own/okbrch.fe
rename to fec/tests/own/okbranch.fe
index e68873e..f6964b8 100644
--- a/fec/tests/own/okbrch.fe
+++ b/fec/tests/own/okbranch.fe
@@ -1,4 +1,4 @@
-unit okbrch;
+unit okbranch;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -13,5 +13,3 @@ fn test(cond: bool) -> i32 {
     x += 1;
     return x;
 }
-
-
diff --git a/fec/tests/own/okdefer2.fe b/fec/tests/own/okdefer.fe
similarity index 92%
rename from fec/tests/own/okdefer2.fe
rename to fec/tests/own/okdefer.fe
index 5185a16..1556b46 100644
--- a/fec/tests/own/okdefer2.fe
+++ b/fec/tests/own/okdefer.fe
@@ -1,4 +1,4 @@
-unit okdefer2;
+unit okdefer;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -11,4 +11,3 @@ fn test() -> i32 {
     x += 1;
     return x;
 }
-
diff --git a/fec/tests/own/okglobc.fe b/fec/tests/own/okglobcp.fe
similarity index 89%
rename from fec/tests/own/okglobc.fe
rename to fec/tests/own/okglobcp.fe
index 6760865..e0c3e95 100644
--- a/fec/tests/own/okglobc.fe
+++ b/fec/tests/own/okglobcp.fe
@@ -1,4 +1,4 @@
-unit okglobc;
+unit okglobcp;
 
 var VALUE: i32 = 7;
 
@@ -8,4 +8,3 @@ fn test() -> i32 {
     let local = VALUE;
     return read(&local);
 }
-
diff --git a/fec/tests/own/oklast1.fe b/fec/tests/own/oklast.fe
similarity index 86%
rename from fec/tests/own/oklast1.fe
rename to fec/tests/own/oklast.fe
index dfb7897..2e1e9f1 100644
--- a/fec/tests/own/oklast1.fe
+++ b/fec/tests/own/oklast.fe
@@ -1,4 +1,4 @@
-unit oklast1;
+unit oklast;
 
 fn test() -> i32 {
     var x: i32 = 0;
@@ -7,5 +7,3 @@ fn test() -> i32 {
     x += 1;
     return x;
 }
-
-
diff --git a/fec/tests/own/okr8fr.fe b/fec/tests/own/okr8free.fe
similarity index 92%
rename from fec/tests/own/okr8fr.fe
rename to fec/tests/own/okr8free.fe
index 49c2ac8..0ae189e 100644
--- a/fec/tests/own/okr8fr.fe
+++ b/fec/tests/own/okr8free.fe
@@ -1,4 +1,4 @@
-unit okr8fr;
+unit okr8free;
 
 fn head(s: []u8) -> &u8 {
     return &s[0];
@@ -11,5 +11,3 @@ fn test() -> u8 {
     a[0] = 7 as u8;
     return v;
 }
-
-
diff --git a/fec/tests/own/okr8jn.fe b/fec/tests/own/okr8join.fe
similarity index 94%
rename from fec/tests/own/okr8jn.fe
rename to fec/tests/own/okr8join.fe
index 9395a1e..b2e67dd 100644
--- a/fec/tests/own/okr8jn.fe
+++ b/fec/tests/own/okr8join.fe
@@ -1,4 +1,4 @@
-unit okr8jn;
+unit okr8join;
 
 fn select(s: str, from_param: bool) -> str {
     if from_param { return s; }
@@ -12,5 +12,3 @@ fn test() -> u8 {
     bytes[0] = 8 as u8;
     return value;
 }
-
-
diff --git a/fec/tests/own/okr8mt.fe b/fec/tests/own/okr8meth.fe
similarity index 93%
rename from fec/tests/own/okr8mt.fe
rename to fec/tests/own/okr8meth.fe
index 271c723..8f49258 100644
--- a/fec/tests/own/okr8mt.fe
+++ b/fec/tests/own/okr8meth.fe
@@ -1,4 +1,4 @@
-unit okr8mt;
+unit okr8meth;
 
 struct Box {
     value: i32,
@@ -15,5 +15,3 @@ fn test() -> i32 {
     b.value = 5;
     return v;
 }
-
-
diff --git a/fec/tests/own/okr8st.fe b/fec/tests/own/okr8stat.fe
similarity index 73%
rename from fec/tests/own/okr8st.fe
rename to fec/tests/own/okr8stat.fe
index 6158944..5db67d4 100644
--- a/fec/tests/own/okr8st.fe
+++ b/fec/tests/own/okr8stat.fe
@@ -1,7 +1,5 @@
-unit okr8st;
+unit okr8stat;
 
 fn name() -> str {
     return "main";
 }
-
-
diff --git a/fec/tests/own/okrbor1.fe b/fec/tests/own/okrebor.fe
similarity index 90%
rename from fec/tests/own/okrbor1.fe
rename to fec/tests/own/okrebor.fe
index 0569f27..b92ebf8 100644
--- a/fec/tests/own/okrbor1.fe
+++ b/fec/tests/own/okrebor.fe
@@ -1,4 +1,4 @@
-unit okrbor1;
+unit okrebor;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -9,5 +9,3 @@ fn test() -> i32 {
     r.^ = v + 1;
     return r.^;
 }
-
-
diff --git a/fec/tests/own/okrtls.fe b/fec/tests/own/okrtlast.fe
similarity index 91%
rename from fec/tests/own/okrtls.fe
rename to fec/tests/own/okrtlast.fe
index e917db9..bd87c4e 100644
--- a/fec/tests/own/okrtls.fe
+++ b/fec/tests/own/okrtlast.fe
@@ -1,4 +1,4 @@
-unit okrtls;
+unit okrtlast;
 
 struct Pair { a: i32, b: i32, }
 
@@ -9,5 +9,3 @@ fn test() -> i32 {
     p.b = 4;
     return p.a + p.b;
 }
-
-
diff --git a/fec/tests/own/okshar1.fe b/fec/tests/own/okshare.fe
similarity index 90%
rename from fec/tests/own/okshar1.fe
rename to fec/tests/own/okshare.fe
index a82bdd0..1740394 100644
--- a/fec/tests/own/okshar1.fe
+++ b/fec/tests/own/okshare.fe
@@ -1,4 +1,4 @@
-unit okshar1;
+unit okshare;
 
 fn add(a: &i32, b: &i32) -> i32 {
     return a.^ + b.^;
@@ -10,5 +10,3 @@ fn test() -> i32 {
     let b = &x;
     return add(a, b);
 }
-
-
diff --git a/fec/tests/own/okslre1.fe b/fec/tests/own/okslreb.fe
similarity index 91%
rename from fec/tests/own/okslre1.fe
rename to fec/tests/own/okslreb.fe
index 1f3aef6..7b8a6a7 100644
--- a/fec/tests/own/okslre1.fe
+++ b/fec/tests/own/okslreb.fe
@@ -1,4 +1,4 @@
-unit okslre1;
+unit okslreb;
 
 fn first(s: []u8) -> u8 { return s[0]; }
 
@@ -9,5 +9,3 @@ fn test() -> u8 {
     s[0] = 9 as u8;
     return v;
 }
-
-
diff --git a/fec/tests/own/okstat1.fe b/fec/tests/own/okstatic.fe
similarity index 86%
rename from fec/tests/own/okstat1.fe
rename to fec/tests/own/okstatic.fe
index e231e3c..ae2487e 100644
--- a/fec/tests/own/okstat1.fe
+++ b/fec/tests/own/okstatic.fe
@@ -1,4 +1,4 @@
-unit okstat1;
+unit okstatic;
 
 static VALUE: i32 = 7;
 
@@ -9,5 +9,3 @@ fn get() -> &i32 {
 fn test() -> i32 {
     return get().^;
 }
-
-
diff --git a/fec/tests/own/oktemp1.fe b/fec/tests/own/oktemp.fe
similarity index 89%
rename from fec/tests/own/oktemp1.fe
rename to fec/tests/own/oktemp.fe
index c382b89..d88b1f7 100644
--- a/fec/tests/own/oktemp1.fe
+++ b/fec/tests/own/oktemp.fe
@@ -1,4 +1,4 @@
-unit oktemp1;
+unit oktemp;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -8,5 +8,3 @@ fn test() -> i32 {
     x += 1;
     return v + x;
 }
-
-
diff --git a/fec/tests/own/oktrim1.fe b/fec/tests/own/oktrim.fe
similarity index 78%
rename from fec/tests/own/oktrim1.fe
rename to fec/tests/own/oktrim.fe
index f1e403c..cf416ac 100644
--- a/fec/tests/own/oktrim1.fe
+++ b/fec/tests/own/oktrim.fe
@@ -1,7 +1,5 @@
-unit oktrim1;
+unit oktrim;
 
 fn trimmed(line: str) -> str {
     return line.trim();
 }
-
-
diff --git a/fec/tests/own/okwcal1.fe b/fec/tests/own/okwcall.fe
similarity index 91%
rename from fec/tests/own/okwcal1.fe
rename to fec/tests/own/okwcall.fe
index a81f447..a53efe2 100644
--- a/fec/tests/own/okwcal1.fe
+++ b/fec/tests/own/okwcall.fe
@@ -1,4 +1,4 @@
-unit okwcal1;
+unit okwcall;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -9,5 +9,3 @@ fn test() -> i32 {
     m.^ = value + 1;
     return m.^;
 }
-
-
diff --git a/fec/tests/types/badarith.fe b/fec/tests/types/bad_ari.fe
similarity index 85%
rename from fec/tests/types/badarith.fe
rename to fec/tests/types/bad_ari.fe
index 424e3cf..bdf4619 100644
--- a/fec/tests/types/badarith.fe
+++ b/fec/tests/types/bad_ari.fe
@@ -1,4 +1,4 @@
-unit badarith;
+unit bad_ari;
 
 fn add(a: i32, b: i32) -> i32 {
     return a + b;
@@ -7,4 +7,3 @@ fn add(a: i32, b: i32) -> i32 {
 fn main() -> i32 {
     return add(1);
 }
-
diff --git a/fec/tests/types/badasgn.fe b/fec/tests/types/bad_asgn.fe
similarity index 84%
rename from fec/tests/types/badasgn.fe
rename to fec/tests/types/bad_asgn.fe
index eae96b2..3e921bc 100644
--- a/fec/tests/types/badasgn.fe
+++ b/fec/tests/types/bad_asgn.fe
@@ -1,8 +1,7 @@
-unit badasgn;
+unit bad_asgn;
 
 fn main() -> i32 {
     let value: i32 = 1;
     value = 2;
     return value;
 }
-
diff --git a/fec/tests/types/badcast.fe b/fec/tests/types/bad_cast.fe
similarity index 81%
rename from fec/tests/types/badcast.fe
rename to fec/tests/types/bad_cast.fe
index 42ec79f..0eafcfc 100644
--- a/fec/tests/types/badcast.fe
+++ b/fec/tests/types/bad_cast.fe
@@ -1,7 +1,6 @@
-unit badcast;
+unit bad_cast;
 
 fn main() -> i32 {
     let x: i32 = true as i32;
     return x;
 }
-
diff --git a/fec/tests/types/badcond.fe b/fec/tests/types/bad_cond.fe
similarity index 79%
rename from fec/tests/types/badcond.fe
rename to fec/tests/types/bad_cond.fe
index 5773959..a3968f1 100644
--- a/fec/tests/types/badcond.fe
+++ b/fec/tests/types/bad_cond.fe
@@ -1,7 +1,6 @@
-unit badcond;
+unit bad_cond;
 
 fn main() -> i32 {
     if 1 { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/badmlet.fe b/fec/tests/types/bad_mlet.fe
similarity index 84%
rename from fec/tests/types/badmlet.fe
rename to fec/tests/types/bad_mlet.fe
index 7283053..a3960b0 100644
--- a/fec/tests/types/badmlet.fe
+++ b/fec/tests/types/bad_mlet.fe
@@ -1,7 +1,6 @@
-unit badmlet;
+unit bad_mlet;
 
 fn bad() -> void {
     var raw: [2]u8 = [1, 2];
     let s: []mut u8 = raw[..];
 }
-
diff --git a/fec/tests/types/badretu.fe b/fec/tests/types/bad_ret.fe
similarity index 72%
rename from fec/tests/types/badretu.fe
rename to fec/tests/types/bad_ret.fe
index bdeb958..a151ab3 100644
--- a/fec/tests/types/badretu.fe
+++ b/fec/tests/types/bad_ret.fe
@@ -1,6 +1,5 @@
-unit badretu;
+unit bad_ret;
 
 fn main() -> i32 {
     return true;
 }
-
diff --git a/fec/tests/types/badshwr.fe b/fec/tests/types/bad_shwr.fe
similarity index 74%
rename from fec/tests/types/badshwr.fe
rename to fec/tests/types/bad_shwr.fe
index d46977b..7c7881f 100644
--- a/fec/tests/types/badshwr.fe
+++ b/fec/tests/types/bad_shwr.fe
@@ -1,6 +1,5 @@
-unit badshwr;
+unit bad_shwr;
 
 fn bad(s: []u8) -> void {
     s[0] = 1;
 }
-
diff --git a/fec/tests/types/badtype.fe b/fec/tests/types/bad_type.fe
similarity index 86%
rename from fec/tests/types/badtype.fe
rename to fec/tests/types/bad_type.fe
index c3fc863..15a4aca 100644
--- a/fec/tests/types/badtype.fe
+++ b/fec/tests/types/bad_type.fe
@@ -1,4 +1,4 @@
-unit badtype;
+unit bad_type;
 
 fn add(a: i32, b: i32) -> i32 {
     return a + b;
@@ -7,4 +7,3 @@ fn add(a: i32, b: i32) -> i32 {
 fn main() -> i32 {
     return add(true, 1);
 }
-
diff --git a/fec/tests/types/badunit.fe b/fec/tests/types/bad_unit.fe
similarity index 78%
rename from fec/tests/types/badunit.fe
rename to fec/tests/types/bad_unit.fe
index 7074a19..99d8bbd 100644
--- a/fec/tests/types/badunit.fe
+++ b/fec/tests/types/bad_unit.fe
@@ -1,8 +1,6 @@
-unit badunit;
+unit bad_unit;
 
 fn main() -> i32 {
     var value: i32;
     return value;
 }
-
-
diff --git a/fec/tests/types/badunk.fe b/fec/tests/types/bad_unk.fe
similarity index 77%
rename from fec/tests/types/badunk.fe
rename to fec/tests/types/bad_unk.fe
index ec28188..b868c3b 100644
--- a/fec/tests/types/badunk.fe
+++ b/fec/tests/types/bad_unk.fe
@@ -1,6 +1,5 @@
-unit badunk;
+unit bad_unk;
 
 fn main() -> i32 {
     return missing_name;
 }
-
diff --git a/fec/tests/types/badvoid.fe b/fec/tests/types/bad_void.fe
similarity index 86%
rename from fec/tests/types/badvoid.fe
rename to fec/tests/types/bad_void.fe
index 9ab0cae..bf3ce1f 100644
--- a/fec/tests/types/badvoid.fe
+++ b/fec/tests/types/bad_void.fe
@@ -1,4 +1,4 @@
-unit badvoid;
+unit bad_void;
 
 fn noop() {
     return;
@@ -8,4 +8,3 @@ fn main() -> i32 {
     let value: i32 = noop();
     return value;
 }
-
diff --git a/fec/tests/types/badarry.fe b/fec/tests/types/badarr.fe
similarity index 82%
rename from fec/tests/types/badarry.fe
rename to fec/tests/types/badarr.fe
index ad4072f..11007cb 100644
--- a/fec/tests/types/badarry.fe
+++ b/fec/tests/types/badarr.fe
@@ -1,6 +1,5 @@
-unit badarry;
+unit badarr;
 fn main() -> i32 {
     let a: [2]i32 = [1, true, 3];
     return a[0];
 }
-
diff --git a/fec/tests/types/badbyte.fe b/fec/tests/types/badchar.fe
similarity index 79%
rename from fec/tests/types/badbyte.fe
rename to fec/tests/types/badchar.fe
index de2a923..9d1a1d4 100644
--- a/fec/tests/types/badbyte.fe
+++ b/fec/tests/types/badchar.fe
@@ -1,7 +1,6 @@
-unit badbyte;
+unit badchar;
 
 fn main() -> i32 {
     let u: u8 = 'A';
     return u;
 }
-
diff --git a/fec/tests/types/badcyc.fe b/fec/tests/types/badcycle.fe
similarity index 82%
rename from fec/tests/types/badcyc.fe
rename to fec/tests/types/badcycle.fe
index 1b79348..532ea1e 100644
--- a/fec/tests/types/badcyc.fe
+++ b/fec/tests/types/badcycle.fe
@@ -1,8 +1,6 @@
-unit badcyc;
+unit badcycle;
 
 struct A { b: B, }
 struct B { a: A, }
 
 fn main() -> i32 { return 0; }
-
-
diff --git a/fec/tests/types/badfiel.fe b/fec/tests/types/badfield.fe
similarity index 89%
rename from fec/tests/types/badfiel.fe
rename to fec/tests/types/badfield.fe
index 6c0d2fd..4fa664c 100644
--- a/fec/tests/types/badfiel.fe
+++ b/fec/tests/types/badfield.fe
@@ -1,4 +1,4 @@
-unit badfiel;
+unit badfield;
 
 struct Point { x: i32, y: i32, }
 fn main() -> i32 {
@@ -6,4 +6,3 @@ fn main() -> i32 {
     p.x = 3;
     return p.x;
 }
-
diff --git a/fec/tests/types/badfmem.fe b/fec/tests/types/badfld.fe
similarity index 87%
rename from fec/tests/types/badfmem.fe
rename to fec/tests/types/badfld.fe
index 8814d35..68704be 100644
--- a/fec/tests/types/badfmem.fe
+++ b/fec/tests/types/badfld.fe
@@ -1,7 +1,6 @@
-unit badfmem;
+unit badfld;
 struct Point { x: i32, y: i32, }
 fn main() -> i32 {
     let p: Point = Point{ x: 1 };
     return p.z;
 }
-
diff --git a/fec/tests/types/badidx.fe b/fec/tests/types/badindex.fe
similarity index 84%
rename from fec/tests/types/badidx.fe
rename to fec/tests/types/badindex.fe
index 19c72f7..06b1b10 100644
--- a/fec/tests/types/badidx.fe
+++ b/fec/tests/types/badindex.fe
@@ -1,8 +1,7 @@
-unit badidx;
+unit badindex;
 
 fn main() -> i32 {
     let a: [2]i32 = [1, 2];
     a[0] = 3;
     return a[0];
 }
-
diff --git a/fec/tests/types/badmatch.fe b/fec/tests/types/badmat.fe
similarity index 87%
rename from fec/tests/types/badmatch.fe
rename to fec/tests/types/badmat.fe
index 0132224..3c7df6a 100644
--- a/fec/tests/types/badmatch.fe
+++ b/fec/tests/types/badmat.fe
@@ -1,7 +1,6 @@
-unit badmatch;
+unit badmat;
 enum Shape { Empty, Circle(i32), }
 fn main() -> i32 {
     match Shape.Empty { Empty => 0; }
     return 0;
 }
-
diff --git a/fec/tests/types/badstrg.fe b/fec/tests/types/badstr.fe
similarity index 84%
rename from fec/tests/types/badstrg.fe
rename to fec/tests/types/badstr.fe
index 30f39e0..6219d9a 100644
--- a/fec/tests/types/badstrg.fe
+++ b/fec/tests/types/badstr.fe
@@ -1,7 +1,6 @@
-unit badstrg;
+unit badstr;
 fn main() -> i32 {
     var text: str = "abc";
     text[0] = 'z';
     return 0;
 }
-
diff --git a/fec/tests/types/okarra1.fe b/fec/tests/types/ok_arra1.fe
similarity index 89%
rename from fec/tests/types/okarra1.fe
rename to fec/tests/types/ok_arra1.fe
index 8df5963..487b1ec 100644
--- a/fec/tests/types/okarra1.fe
+++ b/fec/tests/types/ok_arra1.fe
@@ -1,8 +1,7 @@
-unit okarra1;
+unit ok_arra1;
 
 fn main() -> i32 {
     let bytes: [3]u8 = [1, 2, 3];
     if bytes[0] == 1 and bytes[2] == 3 { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/okarray.fe b/fec/tests/types/ok_array.fe
similarity index 92%
rename from fec/tests/types/okarray.fe
rename to fec/tests/types/ok_array.fe
index e11ef29..bf748bc 100644
--- a/fec/tests/types/okarray.fe
+++ b/fec/tests/types/ok_array.fe
@@ -1,4 +1,4 @@
-unit okarray;
+unit ok_array;
 
 fn main() -> i32 {
     let a: [3]i32 = [1, 2, 3];
@@ -7,4 +7,3 @@ fn main() -> i32 {
     if a[0] + s[1] + t[0] == 5 and s.n == 3 { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/okcastw.fe b/fec/tests/types/ok_castw.fe
similarity index 91%
rename from fec/tests/types/okcastw.fe
rename to fec/tests/types/ok_castw.fe
index 5d3352e..2e962f5 100644
--- a/fec/tests/types/okcastw.fe
+++ b/fec/tests/types/ok_castw.fe
@@ -1,4 +1,4 @@
-unit okcastw;
+unit ok_castw;
 
 pub fn main() -> i32 {
     var x: i16 = 0;
@@ -9,4 +9,3 @@ pub fn main() -> i32 {
     if y == 3 { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/okcharc.fe b/fec/tests/types/ok_char.fe
similarity index 91%
rename from fec/tests/types/okcharc.fe
rename to fec/tests/types/ok_char.fe
index cd47d6b..e6939b7 100644
--- a/fec/tests/types/okcharc.fe
+++ b/fec/tests/types/ok_char.fe
@@ -1,4 +1,4 @@
-unit okcharc;
+unit ok_char;
 
 fn main() -> i32 {
     let c: char = '\u0041';
@@ -7,4 +7,3 @@ fn main() -> i32 {
     if c == d and u == ('A' as u8) { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/okenum.fe b/fec/tests/types/ok_enum.fe
similarity index 96%
rename from fec/tests/types/okenum.fe
rename to fec/tests/types/ok_enum.fe
index 8e6dfe4..581cbb3 100644
--- a/fec/tests/types/okenum.fe
+++ b/fec/tests/types/ok_enum.fe
@@ -1,4 +1,4 @@
-unit okenum;
+unit ok_enum;
 
 enum Shape { Empty, Circle(i32), Rect { w: i32, h: i32, }, }
 
@@ -14,4 +14,3 @@ fn main() -> i32 {
     if score(Shape.Circle(5)) == 5 and score(Shape.Rect{ w: 2, h: 3 }) == 6 { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/okfor.fe b/fec/tests/types/ok_for.fe
similarity index 97%
rename from fec/tests/types/okfor.fe
rename to fec/tests/types/ok_for.fe
index d191bda..3aab7bf 100644
--- a/fec/tests/types/okfor.fe
+++ b/fec/tests/types/ok_for.fe
@@ -1,4 +1,4 @@
-unit okfor;
+unit ok_for;
 
 fn main() -> i32 {
     var total: i32 = 0;
@@ -16,4 +16,3 @@ fn main() -> i32 {
     if total == 9 and m[0] == 2 { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/okhello.fe b/fec/tests/types/ok_hello.fe
similarity index 95%
rename from fec/tests/types/okhello.fe
rename to fec/tests/types/ok_hello.fe
index ed5305b..e55fedb 100644
--- a/fec/tests/types/okhello.fe
+++ b/fec/tests/types/ok_hello.fe
@@ -1,4 +1,4 @@
-unit okhello;
+unit ok_hello;
 
 fn add(a: i32, b: i32) -> i32 {
     return a + b;
@@ -21,4 +21,3 @@ pub fn main() -> i32 {
         return 1;
     }
 }
-
diff --git a/fec/tests/types/okmutab.fe b/fec/tests/types/ok_mutab.fe
similarity index 93%
rename from fec/tests/types/okmutab.fe
rename to fec/tests/types/ok_mutab.fe
index 8b44f6c..dc596a2 100644
--- a/fec/tests/types/okmutab.fe
+++ b/fec/tests/types/ok_mutab.fe
@@ -1,4 +1,4 @@
-unit okmutab;
+unit ok_mutab;
 
 fn takes_shared(s: []u8) -> u8 { return s[0]; }
 
@@ -9,4 +9,3 @@ fn main() -> i32 {
     if takes_shared(s) == 1 and raw[1] == 9 { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/okneste.fe b/fec/tests/types/ok_neste.fe
similarity index 92%
rename from fec/tests/types/okneste.fe
rename to fec/tests/types/ok_neste.fe
index cf9c392..e8c0485 100644
--- a/fec/tests/types/okneste.fe
+++ b/fec/tests/types/ok_neste.fe
@@ -1,4 +1,4 @@
-unit okneste;
+unit ok_neste;
 
 struct Outer { inner: Inner, }
 struct Inner { value: i32, }
@@ -8,4 +8,3 @@ fn main() -> i32 {
     if x.inner.value == 7 { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/okscope.fe b/fec/tests/types/ok_scope.fe
similarity index 94%
rename from fec/tests/types/okscope.fe
rename to fec/tests/types/ok_scope.fe
index 187a837..153398f 100644
--- a/fec/tests/types/okscope.fe
+++ b/fec/tests/types/ok_scope.fe
@@ -1,4 +1,4 @@
-unit okscope;
+unit ok_scope;
 
 fn register(switch: i32) -> i32 {
     let auto: i32 = switch;
@@ -13,4 +13,3 @@ fn register(switch: i32) -> i32 {
 pub fn main() -> i32 {
     return register(1);
 }
-
diff --git a/fec/tests/types/okstrg.fe b/fec/tests/types/ok_str.fe
similarity index 89%
rename from fec/tests/types/okstrg.fe
rename to fec/tests/types/ok_str.fe
index c758382..fec3064 100644
--- a/fec/tests/types/okstrg.fe
+++ b/fec/tests/types/ok_str.fe
@@ -1,8 +1,7 @@
-unit okstrg;
+unit ok_str;
 
 fn main() -> i32 {
     let text: str = "abc";
     if text[1] == ('b' as u8) and text.n == 3 { return 0; }
     return 1;
 }
-
diff --git a/fec/tests/types/okstruc.fe b/fec/tests/types/ok_struc.fe
similarity index 96%
rename from fec/tests/types/okstruc.fe
rename to fec/tests/types/ok_struc.fe
index ac73d35..1754eb9 100644
--- a/fec/tests/types/okstruc.fe
+++ b/fec/tests/types/ok_struc.fe
@@ -1,4 +1,4 @@
-unit okstruc;
+unit ok_struc;
 
 struct Point { x: i32, y: i32, }
 packed struct PackedPoint { x: u8, y: i32, }
@@ -12,4 +12,3 @@ fn main() -> i32 {
        (Point{ x: 1, y: 2 }.x == 1) and @size_of(Natural) == 8 { return 0; }
     return 1;
 }
-