diff --git a/semantics/lib/program.ml b/semantics/lib/program.ml
index a87065e..de80801 100644
--- a/semantics/lib/program.ml
+++ b/semantics/lib/program.ml
@@ -1,18 +1,17 @@
 (** A module representation for Rio program forms. *)
-module Program = struct
-  type clss = string
-  type set = Class of clss | Union of set list
 
-  type stream =
-    (* Set To Stream *)
-    | Fifo of set
-    | EarliestDeadline of set
-    | ShortestJobNext of set
-    (* Stream To Stream *)
-    | RoundRobin of stream list
-    | Strict of stream list
-    | WeightedFair of stream list * int list
+type clss = string
+type set = Class of clss | Union of set list
 
-  (* Exportable type *)
-  type prog = stream
-end
+type stream =
+  (* Set To Stream *)
+  | Fifo of set
+  | EarliestDeadline of set
+  | ShortestJobNext of set
+  (* Stream To Stream *)
+  | RoundRobin of stream list
+  | Strict of stream list
+  | WeightedFair of stream list * int list
+
+(* Exportable type *)
+type prog = stream
diff --git a/semantics/lib/semantics.ml b/semantics/lib/semantics.ml
index 6557b5c..5cbc2b8 100644
--- a/semantics/lib/semantics.ml
+++ b/semantics/lib/semantics.ml
@@ -21,7 +21,7 @@ module type SemanticsSig = sig
 end
 
 (** An implementation for Rio's operational semantics. *)
-module Semantics (Pkt : Packet) (Q : Queue with type elt = Pkt.t) = struct
+module SemanticsImpl (Pkt : Packet) (Q : Queue with type elt = Pkt.t) = struct
   type set = Program.set
   type prog = Program.prog
   type pkt = Pkt.t
diff --git a/semantics/test/test_semantics.ml b/semantics/test/test_semantics.ml
index 3f67c55..44a4626 100644
--- a/semantics/test/test_semantics.ml
+++ b/semantics/test/test_semantics.ml
@@ -66,8 +66,8 @@ module SemanticsTester
               and type ord = float)
     (Q : Queue.Queue with type elt = Pkt.t) =
 struct
-  include Program.Program
-  module S = Semantics.Semantics (Pkt) (Q)
+  include Program
+  module S = Semantics.SemanticsImpl (Pkt) (Q)
 
   exception QueryFormatException