8 files changed, 14 insertions, 13 deletions
diff --git a/test/c/bitvector.sail b/test/c/bitvector.sail
index 8a80234e..ba23b2cc 100644
--- a/test/c/bitvector.sail
+++ b/test/c/bitvector.sail
@@ -2,7 +2,7 @@ default Order dec
 
 $include <vector_dec.sail>
 
-val test : (vector(16, dec, bit), vector(200, dec, bit)) -> bool
+val test : (bitvector(16, dec), bitvector(200, dec)) -> bool
 
 function test (x, y)  = {
   print_bits("x = ", x);
diff --git a/test/c/bv_literal.sail b/test/c/bv_literal.sail
index 1955b5dd..73f1133c 100644
--- a/test/c/bv_literal.sail
+++ b/test/c/bv_literal.sail
@@ -1,12 +1,12 @@
 
 default Order dec
 
-val "print_bits" : forall 'n. (string, vector('n, dec, bit)) -> unit
+val "print_bits" : forall 'n. (string, bitvector('n, dec)) -> unit
 
 val main : unit -> unit
 
 function main () = {
   let x : bit = bitone;
-  let y : vector(4, dec, bit) = [x, bitone, bitzero, x];
+  let y : bitvector(4, dec) = [x, bitone, bitzero, x];
   print_bits("y = ", y);
 }
 \ No newline at end of file
diff --git a/test/c/eq_struct.sail b/test/c/eq_struct.sail
index 9da12aae..2f6d4453 100644
--- a/test/c/eq_struct.sail
+++ b/test/c/eq_struct.sail
@@ -17,7 +17,7 @@ function neq(x, y) = ~(eq(x, y))
 
 struct S = {
   field1: int,
-  field2: vector(8, dec, bit)
+  field2: bitvector(8, dec)
 }
 
 val "print" : string -> unit
diff --git a/test/c/gvector.sail b/test/c/gvector.sail
index 3e452985..3d6e2bef 100644
--- a/test/c/gvector.sail
+++ b/test/c/gvector.sail
@@ -5,7 +5,7 @@ $include <vector_dec.sail>
 
 val "print_int" : (string, int) -> unit
 
-register R : vector(32, dec, vector(32, dec, bit))
+register R : vector(32, dec, bitvector(32, dec))
 
 register T : vector(32, dec, int)
 
diff --git a/test/c/option.sail b/test/c/option.sail
index aedde8ef..8041e8aa 100644
--- a/test/c/option.sail
+++ b/test/c/option.sail
@@ -5,7 +5,7 @@ $include <flow.sail>
 val print = "print_endline" : string -> unit
 
 val "print_int" : (string, int) -> unit
-val "print_bits" : forall 'n. (string, vector('n, dec, bit)) -> unit
+val "print_bits" : forall 'n. (string, bitvector('n, dec)) -> unit
 
 union option ('a : Type) = {
   None : unit,
@@ -22,7 +22,7 @@ val main : unit -> unit
 function main () = {
   let x : option(int) = Some(5);
   let y : option(int) = None();
-  let z : option(vector(4, dec, bit)) = Some(0xF);
+  let z : option(bitvector(4, dec)) = Some(0xF);
 
   match x {
     Some(a) => print_int("a = ", 5),
@@ -34,7 +34,7 @@ function main () = {
     None()  => print("None")
   };
 
-  let q : soption(vector(4, dec, bit)) = sSome(0xA);
+  let q : soption(bitvector(4, dec)) = sSome(0xA);
 
   match q {
     sSome(c) => print_bits("c = ", c)
diff --git a/test/c/pattern_concat_nest.sail b/test/c/pattern_concat_nest.sail
index 92150e66..df588662 100644
--- a/test/c/pattern_concat_nest.sail
+++ b/test/c/pattern_concat_nest.sail
@@ -1,5 +1,6 @@
 default Order dec
-type bits ('n : Int) = vector('n, dec, bit)
+
+type bits ('n : Int) = bitvector('n, dec)
 
 union option ('a : Type) = {None : unit, Some : 'a}
 
diff --git a/test/c/stack_struct.sail b/test/c/stack_struct.sail
index c5c79a81..5dd0caeb 100644
--- a/test/c/stack_struct.sail
+++ b/test/c/stack_struct.sail
@@ -1,6 +1,6 @@
 default Order dec
 
-type bits ('n : Int) = vector('n, dec, bit)
+type bits ('n : Int) = bitvector('n, dec)
 
 union option ('a : Type) = {
   Some : 'a,
diff --git a/test/c/struct.sail b/test/c/struct.sail
index f3f2b071..21484c6a 100644
--- a/test/c/struct.sail
+++ b/test/c/struct.sail
@@ -1,10 +1,10 @@
 default Order dec
 
-val "print_bits" : forall 'n. (string, vector('n, dec, bit)) -> unit
+val "print_bits" : forall 'n. (string, bitvector('n, dec)) -> unit
 
 struct test = {
-  A : vector(4, dec, bit),
-  B : vector(2, dec, bit),
+  A : bitvector(4, dec),
+  B : bitvector(2, dec),
 }
 
 function main (() : unit) -> unit = {