diff --git a/src/Quasar/Async.hs b/src/Quasar/Async.hs
index 06c196b71053a59be1ae096df780ea5433870794..6fdc536708508ca1168f5a9d7f8df2b73cf39d40 100644
--- a/src/Quasar/Async.hs
+++ b/src/Quasar/Async.hs
@@ -58,7 +58,7 @@ instance MonadAsync (ReaderT ResourceManager IO) where
 
               -- Thread has completed work, "disarm" the disposable and fire it
               void $ atomically $ swapTMVar threadIdVar Nothing
-              awaitDispose disposable
+              disposeAndAwait disposable
 
         do atomically $ putTMVar threadIdVar Nothing
 
diff --git a/src/Quasar/Disposable.hs b/src/Quasar/Disposable.hs
index 238c90ed2da8c9cd45099d668a8dc591110d3a93..145ba9cae8310af264b0de269929f7c5950dcfef 100644
--- a/src/Quasar/Disposable.hs
+++ b/src/Quasar/Disposable.hs
@@ -2,7 +2,7 @@ module Quasar.Disposable (
   -- * Disposable
   IsDisposable(..),
   Disposable,
-  awaitDispose,
+  disposeAndAwait,
   newDisposable,
   synchronousDisposable,
   noDisposable,
@@ -56,8 +56,8 @@ class IsDisposable a where
 
 
 -- | Dispose a resource in the IO monad.
-awaitDispose :: (MonadAwait m, MonadIO m) => IsDisposable a => a -> m ()
-awaitDispose disposable = await =<< liftIO (dispose disposable)
+disposeAndAwait :: (MonadAwait m, MonadIO m) => IsDisposable a => a -> m ()
+disposeAndAwait disposable = await =<< liftIO (dispose disposable)
 
 
 
diff --git a/src/Quasar/Observable.hs b/src/Quasar/Observable.hs
index 7b817faa40e1db3c4402f510149d5d69138977fa..b686664a59d5f8ccb072807941b360be10cb3200 100644
--- a/src/Quasar/Observable.hs
+++ b/src/Quasar/Observable.hs
@@ -94,7 +94,7 @@ class IsRetrievable v o => IsObservable v o | o -> v where
           atomically do
             readTVar calledIdVar >>= \called ->
               unless (called >= currentMessage) retry
-      do awaitDispose
+      do disposeAndAwait
       do
         const $ forever do
           (msgId, msg) <- liftIO $ atomically $ liftA2 (,) (readTVar idVar) (readTVar msgVar)
diff --git a/src/Quasar/Timer.hs b/src/Quasar/Timer.hs
index 9f6cebf7c60e6951058222b150ad132733ee09a5..76eeacd5407f1d34945d380c7d6b35fa63090c37 100644
--- a/src/Quasar/Timer.hs
+++ b/src/Quasar/Timer.hs
@@ -177,7 +177,7 @@ newTimer scheduler time = do
 
 
 sleepUntil :: TimerScheduler -> UTCTime -> IO ()
-sleepUntil scheduler time = bracketOnError (newTimer scheduler time) awaitDispose await
+sleepUntil scheduler time = bracketOnError (newTimer scheduler time) disposeAndAwait await
 
 
 
diff --git a/test/Quasar/DisposableSpec.hs b/test/Quasar/DisposableSpec.hs
index ba961d3e74da8a56951b3f11aeea18b542340597..66ff79ff1d12f25dc837c601589aa2e6c8bf797d 100644
--- a/test/Quasar/DisposableSpec.hs
+++ b/test/Quasar/DisposableSpec.hs
@@ -26,20 +26,20 @@ spec = parallel $ do
     describe "newDisposable" $ do
       it "signals it's disposed state" $ do
         disposable <- newDisposable $ pure $ pure ()
-        void $ forkIO $ threadDelay 100000 >> awaitDispose disposable
+        void $ forkIO $ threadDelay 100000 >> disposeAndAwait disposable
         await (isDisposed disposable)
         pure () :: IO ()
 
       it "can be disposed multiple times" $ io do
         disposable <- newDisposable $ pure $ pure ()
-        awaitDispose disposable
-        awaitDispose disposable
+        disposeAndAwait disposable
+        disposeAndAwait disposable
         await (isDisposed disposable)
 
       it "can be disposed in parallel" $ do
         disposable <- newDisposable $ pure () <$ threadDelay 100000
-        void $ forkIO $ awaitDispose disposable
-        awaitDispose disposable
+        void $ forkIO $ disposeAndAwait disposable
+        disposeAndAwait disposable
         await (isDisposed disposable)
 
 
@@ -98,4 +98,4 @@ spec = parallel $ do
     it "can attach an disposable that is disposed asynchronously" $ do
       withResourceManager \resourceManager -> do
         disposable <- attachDisposeAction resourceManager $ pure () <$ threadDelay 100000
-        void $ forkIO $ awaitDispose disposable
+        void $ forkIO $ disposeAndAwait disposable
diff --git a/test/Quasar/Observable/ObservableHashMapSpec.hs b/test/Quasar/Observable/ObservableHashMapSpec.hs
index 85846d960582f5b1090248ccaca57bdf053e312d..0bef67ae470b7a9f13f932b486b31128381e54f2 100644
--- a/test/Quasar/Observable/ObservableHashMapSpec.hs
+++ b/test/Quasar/Observable/ObservableHashMapSpec.hs
@@ -39,7 +39,7 @@ spec = parallel $ do
       OM.insert "key2" "value2" om
       lastCallbackShouldBe (HM.fromList [("key", "value"), ("key2", "value2")])
 
-      awaitDispose subscriptionHandle
+      disposeAndAwait subscriptionHandle
       lastCallbackShouldBe (HM.fromList [("key", "value"), ("key2", "value2")])
 
       OM.insert "key3" "value3" om
@@ -61,7 +61,7 @@ spec = parallel $ do
       OM.insert "key2" "value2" om
       lastDeltaShouldBe $ Insert "key2" "value2"
 
-      awaitDispose subscriptionHandle
+      disposeAndAwait subscriptionHandle
       lastDeltaShouldBe $ Insert "key2" "value2"
 
       OM.insert "key3" "value3" om
@@ -120,7 +120,7 @@ spec = parallel $ do
       v2ShouldBe $ Just "changed"
 
       retrieveIO om `shouldReturn` HM.singleton "key2" "changed"
-      awaitDispose handle2
+      disposeAndAwait handle2
 
       OM.lookupDelete "key2" om `shouldReturn` Just "changed"
       v2ShouldBe $ Just "changed"
diff --git a/test/Quasar/Observable/ObservablePrioritySpec.hs b/test/Quasar/Observable/ObservablePrioritySpec.hs
index ba57c9359b59cd8db7c3e662d576f45bd52f53a4..e58d9d97600d174d6c79c20f34bd2dbbd8c34655 100644
--- a/test/Quasar/Observable/ObservablePrioritySpec.hs
+++ b/test/Quasar/Observable/ObservablePrioritySpec.hs
@@ -22,9 +22,9 @@ spec = do
       retrieveIO op `shouldReturn` Just "p2"
       p1 <- OP.insertValue op 1 "p1"
       retrieveIO op `shouldReturn` Just "p2"
-      awaitDispose p2
+      disposeAndAwait p2
       retrieveIO op `shouldReturn` Just "p1"
-      awaitDispose p1
+      disposeAndAwait p1
       retrieveIO op `shouldReturn` Nothing
     it "sends updates when its value changes" $ do
       result <- newIORef []
@@ -40,9 +40,9 @@ spec = do
       mostRecentShouldBe (Just "p2")
       p1 <- OP.insertValue op 1 "p1"
       mostRecentShouldBe (Just "p2")
-      awaitDispose p2
+      disposeAndAwait p2
       mostRecentShouldBe (Just "p1")
-      awaitDispose p1
+      disposeAndAwait p1
       mostRecentShouldBe Nothing
 
       length <$> readIORef result `shouldReturn` 4