diff --git a/quasar.cabal b/quasar.cabal
index 2b23db394351886f9ff9258ccd173109f9d35430..83d3a792d67bc6c10781f4d6a75f0c822349e325 100644
--- a/quasar.cabal
+++ b/quasar.cabal
@@ -89,9 +89,9 @@ library
     Quasar.Async.Fork
     Quasar.Async.STMHelper
     Quasar.Async
-    Quasar.Awaitable
     Quasar.Exceptions
     Quasar.Exceptions.ExceptionSink
+    Quasar.Future
     Quasar.MonadQuasar
     Quasar.MonadQuasar.Misc
     Quasar.Observable
diff --git a/src/Quasar.hs b/src/Quasar.hs
index 354eb63318b04cbe78f106a665f5b26a1dee7ffa..2d2936dfd46120cde3d296b0d6cebd6b3b071d98 100644
--- a/src/Quasar.hs
+++ b/src/Quasar.hs
@@ -1,13 +1,13 @@
 module Quasar (
   module Quasar.Async,
-  module Quasar.Awaitable,
+  module Quasar.Future,
   module Quasar.MonadQuasar,
   module Quasar.Observable,
   module Quasar.Resources,
 ) where
 
 import Quasar.Async
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.MonadQuasar
 import Quasar.Observable
 import Quasar.Resources
diff --git a/src/Quasar/Async.hs b/src/Quasar/Async.hs
index 91e4513271864e0cb902de79ef72be777e0e52fd..76fd3483d4cf79cfdc3354f8cff66136c72ba793 100644
--- a/src/Quasar/Async.hs
+++ b/src/Quasar/Async.hs
@@ -21,7 +21,7 @@ import Control.Concurrent (ThreadId)
 import Control.Concurrent.STM
 import Control.Monad.Catch
 import Quasar.Async.Fork
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.MonadQuasar
 import Quasar.Prelude
diff --git a/src/Quasar/Async/Fork.hs b/src/Quasar/Async/Fork.hs
index 3530ab24444bb0eb303b9ffbefe1747ed0803142..17afe6ff62c949bf342d01132ac12c64f124e50f 100644
--- a/src/Quasar/Async/Fork.hs
+++ b/src/Quasar/Async/Fork.hs
@@ -19,7 +19,7 @@ import Control.Concurrent (ThreadId)
 import Control.Concurrent.STM
 import Control.Monad.Catch
 import Quasar.Async.STMHelper
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.Prelude
 import Quasar.Utils.ShortIO
diff --git a/src/Quasar/Async/STMHelper.hs b/src/Quasar/Async/STMHelper.hs
index 404fb74f8152e7d1b531ded6cfef250d1d078700..aa5560f6b15862a85f6a0ffe06a0e7cffca94c3a 100644
--- a/src/Quasar/Async/STMHelper.hs
+++ b/src/Quasar/Async/STMHelper.hs
@@ -10,7 +10,7 @@ import Control.Concurrent (forkIO)
 import Control.Concurrent.STM
 import Control.Exception (BlockedIndefinitelyOnSTM)
 import Control.Monad.Catch
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.Prelude
 import Quasar.Utils.ShortIO
diff --git a/src/Quasar/Awaitable.hs b/src/Quasar/Future.hs
similarity index 99%
rename from src/Quasar/Awaitable.hs
rename to src/Quasar/Future.hs
index 47dd6b7cdcfe40bd57d4e54806a1a677fcaaed1e..3e1675d862ecdfc7443c00ad076b3a6e6c0ebfb2 100644
--- a/src/Quasar/Awaitable.hs
+++ b/src/Quasar/Future.hs
@@ -1,4 +1,4 @@
-module Quasar.Awaitable (
+module Quasar.Future (
   -- * MonadAwaitable
   MonadAwait(..),
   peekAwaitable,
diff --git a/src/Quasar/MonadQuasar.hs b/src/Quasar/MonadQuasar.hs
index e522ca65de5d6dbeae583655567f2813cfa423a1..372eadf21410e0c147097988cd03177cd1a9f289 100644
--- a/src/Quasar/MonadQuasar.hs
+++ b/src/Quasar/MonadQuasar.hs
@@ -35,7 +35,7 @@ import Control.Monad.Catch
 import Control.Monad.Reader
 import GHC.Records (HasField(..))
 import Quasar.Async.STMHelper
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.Prelude
 import Quasar.Resources.Disposer
diff --git a/src/Quasar/MonadQuasar/Misc.hs b/src/Quasar/MonadQuasar/Misc.hs
index 63b82a919bf7939014a745f01d68b2a7d788e98f..a01341fce48e48e3d93c7d145cb4a8941ca9b9ed 100644
--- a/src/Quasar/MonadQuasar/Misc.hs
+++ b/src/Quasar/MonadQuasar/Misc.hs
@@ -15,7 +15,7 @@ import Control.Concurrent.STM
 import Control.Monad.Catch
 import Control.Monad.Reader
 import Data.List.NonEmpty
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Async
 import Quasar.Async.STMHelper
 import Quasar.Exceptions.ExceptionSink
diff --git a/src/Quasar/Observable.hs b/src/Quasar/Observable.hs
index ef29c6b269dbdcb6e238096a0e62073a53cf6dbc..85b05df48ff7e986c0303802ec00fec7729d5078 100644
--- a/src/Quasar/Observable.hs
+++ b/src/Quasar/Observable.hs
@@ -35,7 +35,7 @@ module Quasar.Observable (
 --import Data.HashMap.Strict qualified as HM
 --import Data.IORef
 --import Data.Unique
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.Disposable
 --import Quasar.Prelude
 --import Quasar.ResourceManager
diff --git a/src/Quasar/Resources.hs b/src/Quasar/Resources.hs
index e1bf6bace05d7130847c66e08a75d6ba05485ee4..9125adfb46931a56874a3e43887209fe7ddedce5 100644
--- a/src/Quasar/Resources.hs
+++ b/src/Quasar/Resources.hs
@@ -36,7 +36,7 @@ module Quasar.Resources (
 
 import Control.Concurrent.STM
 import Control.Monad.Catch
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Async.Fork
 import Quasar.Async.STMHelper
 import Quasar.Exceptions
diff --git a/src/Quasar/Resources/Disposer.hs b/src/Quasar/Resources/Disposer.hs
index 63c84faa58a878163b4f0c05d09fb4f286e08e63..6d3a9bade2835985fd71bb900ca494777b379fad 100644
--- a/src/Quasar/Resources/Disposer.hs
+++ b/src/Quasar/Resources/Disposer.hs
@@ -26,7 +26,7 @@ import Data.HashMap.Strict qualified as HM
 import Data.HashSet (HashSet)
 import Data.HashSet qualified as HashSet
 import Quasar.Async.STMHelper
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.Prelude
 import Quasar.Utils.ShortIO
diff --git a/src/Quasar/Timer.hs b/src/Quasar/Timer.hs
index fd189ccc5f061dd1a342d886f8431f28c8cc7d72..338f4d634cc24a4ff9614b02b108b8c61c80ae96 100644
--- a/src/Quasar/Timer.hs
+++ b/src/Quasar/Timer.hs
@@ -23,7 +23,7 @@ import Data.Time.Clock (UTCTime, diffUTCTime, getCurrentTime)
 import Data.Foldable (toList)
 import Quasar.Async.STMHelper
 import Quasar.Async
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Exceptions
 import Quasar.MonadQuasar
 import Quasar.Prelude
diff --git a/src/Quasar/Timer/TimerFd.hs b/src/Quasar/Timer/TimerFd.hs
index 8768d111e462243449fd477cff1bf44bab6765a4..a1847d5fc6b8f93702b6eb072e5d4e70728be42f 100644
--- a/src/Quasar/Timer/TimerFd.hs
+++ b/src/Quasar/Timer/TimerFd.hs
@@ -12,7 +12,7 @@ import Control.Concurrent
 import Control.Monad.Catch
 import Foreign
 import Foreign.C
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Async
 import Quasar.MonadQuasar
 import Quasar.Prelude
diff --git a/src/Quasar/Utils/ShortIO.hs b/src/Quasar/Utils/ShortIO.hs
index 1e5fb1b2daf53368a57eb4d3698a3c51f29ce776..22b8ad7bebf97b349617a0c290651b977b817177 100644
--- a/src/Quasar/Utils/ShortIO.hs
+++ b/src/Quasar/Utils/ShortIO.hs
@@ -15,7 +15,7 @@ module Quasar.Utils.ShortIO (
 ) where
 
 import Control.Monad.Catch
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Prelude
 import Control.Concurrent
 
diff --git a/src/Quasar/Utils/TOnce.hs b/src/Quasar/Utils/TOnce.hs
index 94013154e1271e0755098b857407c3b30995e3d3..5850e7210613722a46357a91a31d38b648b8b88c 100644
--- a/src/Quasar/Utils/TOnce.hs
+++ b/src/Quasar/Utils/TOnce.hs
@@ -9,7 +9,7 @@ module Quasar.Utils.TOnce (
 ) where
 
 import Control.Concurrent.STM
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Prelude
 
 data TOnceAlreadyFinalized = TOnceAlreadyFinalized
diff --git a/test/Quasar/AsyncSpec.hs b/test/Quasar/AsyncSpec.hs
index eb4374ce8ffb0c709854fa59f961de37ec660c7d..43a1d6081638e07c2aa3759e073148cc812f735f 100644
--- a/test/Quasar/AsyncSpec.hs
+++ b/test/Quasar/AsyncSpec.hs
@@ -6,7 +6,7 @@ module Quasar.AsyncSpec (spec) where
 import Prelude
 import Test.Hspec
 --import Quasar.Async
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.ResourceManager
 --import System.Timeout
 
diff --git a/test/Quasar/AwaitableSpec.hs b/test/Quasar/AwaitableSpec.hs
index 4f88899d6c49354cf8e98fb97a7c4ab5fc418439..60386673eb593d9fb9d9edf6cbc5ac0d5349673b 100644
--- a/test/Quasar/AwaitableSpec.hs
+++ b/test/Quasar/AwaitableSpec.hs
@@ -5,7 +5,7 @@ import Control.Concurrent.STM
 import Control.Monad.Catch
 import GHC.Conc (unsafeIOToSTM)
 import Test.Hspec
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Prelude
 
 data TestException = TestException
diff --git a/test/Quasar/Observable/ObservableHashMapSpec.hs b/test/Quasar/Observable/ObservableHashMapSpec.hs
index 041ac64abd778029839cc47647ea47c306eba1e3..39808adc009510af6ce635e681c1a5726e3359fc 100644
--- a/test/Quasar/Observable/ObservableHashMapSpec.hs
+++ b/test/Quasar/Observable/ObservableHashMapSpec.hs
@@ -4,7 +4,7 @@ module Quasar.Observable.ObservableHashMapSpec (spec) where
 --import Control.Monad (void)
 --import Data.HashMap.Strict qualified as HM
 --import Data.IORef
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.Disposable
 --import Quasar.Observable
 --import Quasar.Observable.Delta
diff --git a/test/Quasar/Observable/ObservablePrioritySpec.hs b/test/Quasar/Observable/ObservablePrioritySpec.hs
index e6456d0dfa180275ecb7243171d2ae82e0bbda83..c4c4950677301b64d291334ec4c75d87d4756312 100644
--- a/test/Quasar/Observable/ObservablePrioritySpec.hs
+++ b/test/Quasar/Observable/ObservablePrioritySpec.hs
@@ -2,7 +2,7 @@ module Quasar.Observable.ObservablePrioritySpec (spec) where
 
 --import Control.Monad (void)
 --import Data.IORef
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.Disposable
 --import Quasar.Observable
 --import Quasar.Observable.ObservablePriority (ObservablePriority)
diff --git a/test/Quasar/ObservableSpec.hs b/test/Quasar/ObservableSpec.hs
index 38d2a61e9c690559c5e115562fade09dc4cf293f..75074ae6a9928cef8037b15cb08c40e773311550 100644
--- a/test/Quasar/ObservableSpec.hs
+++ b/test/Quasar/ObservableSpec.hs
@@ -2,7 +2,7 @@ module Quasar.ObservableSpec (spec) where
 
 --import Data.IORef
 import Quasar.Prelude
---import Quasar.Awaitable
+--import Quasar.Future
 --import Quasar.Observable
 --import Quasar.ResourceManager
 import Test.Hspec
diff --git a/test/Quasar/ResourcesSpec.hs b/test/Quasar/ResourcesSpec.hs
index 8a38d2f90ae8fbfbd3dc932de814f65af13e78e4..7ccd6733c3ba9970215d6081167f66afddaf7f58 100644
--- a/test/Quasar/ResourcesSpec.hs
+++ b/test/Quasar/ResourcesSpec.hs
@@ -6,7 +6,7 @@ import Control.Exception
 import Control.Monad.Catch
 import Quasar.Prelude
 import Test.Hspec
-import Quasar.Awaitable
+import Quasar.Future
 import Quasar.Resources
 import Quasar.MonadQuasar