diff --git a/src/partisan_causality_backend.erl b/src/partisan_causality_backend.erl
index ace5accc..5a8fbfc0 100644
--- a/src/partisan_causality_backend.erl
+++ b/src/partisan_causality_backend.erl
@@ -71,7 +71,7 @@ init([Label]) ->
     MyNode = partisan_peer_service_manager:mynode(),
 
     %% Generate a local clock that's used to track local dependencies.
-    LocalClock = vclock:fresh(),
+    LocalClock = partisan_vclock:fresh(),
 
     %% Initiaize order buffer.
     OrderBuffer = orddict:new(),
@@ -121,7 +121,7 @@ handle_call({emit, Node, ServerRef, Message},
             _From, 
             #state{my_node=MyNode, label=Label, local_clock=LocalClock0, order_buffer=OrderBuffer0}=State) ->
     %% Bump our local clock.
-    LocalClock = vclock:increment(MyNode, LocalClock0),
+    LocalClock = partisan_vclock:increment(MyNode, LocalClock0),
 
     %% Only transmit order buffer containing single clock.
     FilteredOrderBuffer = orddict:filter(fun(Key, _Value) -> Key =:= Node end, OrderBuffer0),
@@ -192,15 +192,15 @@ deliver(#state{my_node=MyNode, local_clock=LocalClock, order_buffer=OrderBuffer,
         IncomingOrderBuffer, MessageClock, ServerRef, Message) ->
     %% Merge order buffers.
     MergeFun = fun(_Key, Value1, Value2) ->
-        vclock:merge([Value1, Value2])
+        partisan_vclock:merge([Value1, Value2])
     end,
     orddict:merge(MergeFun, IncomingOrderBuffer, OrderBuffer),
 
     %% Merge clocks.
-    MergedLocalClock = vclock:merge([LocalClock, MessageClock]),
+    MergedLocalClock = partisan_vclock:merge([LocalClock, MessageClock]),
 
     %% Advance our clock.
-    IncrementedLocalClock = vclock:increment(MyNode, MergedLocalClock),
+    IncrementedLocalClock = partisan_vclock:increment(MyNode, MergedLocalClock),
 
     %% Deliver the actual message.
     case DeliveryFun of
@@ -238,7 +238,7 @@ internal_receive_message({causal, _Label, _Node, ServerRef, IncomingOrderBuffer,
             deliver(State0#state{buffered_messages=BufferedMessages -- [FullMessage]}, IncomingOrderBuffer, MessageClock, ServerRef, Message);
         %% Dependencies.
         {ok, DependencyClock} ->
-            case vclock:dominates(LocalClock, DependencyClock) of
+            case partisan_vclock:dominates(LocalClock, DependencyClock) of
                 %% Dependencies met.
                 true ->
                     lager:info("Message ~p dependencies met, delivering.", [MessageClock]),
diff --git a/src/partisan_default_peer_service_manager.erl b/src/partisan_default_peer_service_manager.erl
index 7f56681a..01751515 100644
--- a/src/partisan_default_peer_service_manager.erl
+++ b/src/partisan_default_peer_service_manager.erl
@@ -305,7 +305,7 @@ init([]) ->
     schedule_retransmit(),
 
     Actor = gen_actor(),
-    VClock = vclock:fresh(),
+    VClock = partisan_vclock:fresh(),
     Membership = maybe_load_state_from_disk(Actor),
     Connections = partisan_peer_service_connections:new(),
 
@@ -464,7 +464,7 @@ handle_call({forward_message, Name, Channel, Clock, PartitionKey, ServerRef, Mes
     case FilterStatus of
         true ->
             %% Increment the clock.
-            VClock = vclock:increment(myself(), VClock0),
+            VClock = partisan_vclock:increment(myself(), VClock0),
 
             %% Are we using causality?
             CausalLabel = proplists:get_value(causal_label, Options, undefined),
diff --git a/src/vclock.erl b/src/partisan_vclock.erl
similarity index 99%
rename from src/vclock.erl
rename to src/partisan_vclock.erl
index cfc9b347..e52a64c5 100644
--- a/src/vclock.erl
+++ b/src/partisan_vclock.erl
@@ -32,7 +32,7 @@
 %% pp. 215-226
 %% [http://homes.cs.washington.edu/~arvind/cs425/doc/mattern89virtual.pdf]
 
--module(vclock).
+-module(partisan_vclock).
 
 -export([fresh/0, descends/2, merge/1, get_counter/2, subtract_dots/2,
          increment/2, all_nodes/1, equal/2,