diff --git a/knots/thread-pool.scm b/knots/thread-pool.scm
index 7dad3d8..b176162 100644
--- a/knots/thread-pool.scm
+++ b/knots/thread-pool.scm
@@ -184,21 +184,21 @@ from there, or #f if that would be an empty string."
                  (thread-pool-resource-pool pool))
                 'default-checkout-timeout)))
 
-(define &thread-pool-timeout
-  (make-exception-type '&thread-pool-timeout
+(define &thread-pool-timeout-error
+  (make-exception-type '&thread-pool-timeout-error
                        &error
                        '(pool)))
 
 (define make-thread-pool-timeout-error
-  (record-constructor &thread-pool-timeout))
+  (record-constructor &thread-pool-timeout-error))
 
 (define thread-pool-timeout-error-pool
   (exception-accessor
-   &thread-pool-timeout
-   (record-accessor &thread-pool-timeout 'pool)))
+   &thread-pool-timeout-error
+   (record-accessor &thread-pool-timeout-error 'pool)))
 
 (define thread-pool-timeout-error?
-  (record-predicate &thread-pool-timeout))
+  (record-predicate &thread-pool-timeout-error))
 
 (define* (make-fixed-size-thread-pool size
                                       #:key
diff --git a/knots/timeout.scm b/knots/timeout.scm
index 552d079..58306e0 100644
--- a/knots/timeout.scm
+++ b/knots/timeout.scm
@@ -34,13 +34,13 @@
             wait-until-port-readable-operation
             wait-until-port-writable-operation
 
-            &port-timeout
+            &port-timeout-error
             port-timeout-error?
 
-            &port-read-timeout
-            port-read-timeout-error
+            &port-read-timeout-error
+            port-read-timeout-error?
 
-            &port-write-timeout
+            &port-write-timeout-error
             port-write-timeout-error?
 
             with-port-timeouts))
@@ -76,38 +76,38 @@
       (vals
        (apply values vals)))))
 
-(define &port-timeout
-  (make-exception-type '&port-timeout
+(define &port-timeout-error
+  (make-exception-type '&port-timeout-error
                        &external-error
                        '(thunk port)))
 
 (define make-port-timeout-error
-  (record-constructor &port-timeout))
+  (record-constructor &port-timeout-error))
 
 (define port-timeout-error?
-  (record-predicate &port-timeout))
+  (record-predicate &port-timeout-error))
 
-(define &port-read-timeout
-  (make-exception-type '&port-read-timeout
-                       &port-timeout
+(define &port-read-timeout-error
+  (make-exception-type '&port-read-timeout-error
+                       &port-timeout-error
                        '()))
 
 (define make-port-read-timeout-error
-  (record-constructor &port-read-timeout))
+  (record-constructor &port-read-timeout-error))
 
 (define port-read-timeout-error?
-  (record-predicate &port-read-timeout))
+  (record-predicate &port-read-timeout-error))
 
-(define &port-write-timeout
-  (make-exception-type '&port-write-timeout
-                       &port-timeout
+(define &port-write-timeout-error
+  (make-exception-type '&port-write-timeout-error
+                       &port-timeout-error
                        '()))
 
 (define make-port-write-timeout-error
-  (record-constructor &port-write-timeout))
+  (record-constructor &port-write-timeout-error))
 
 (define port-write-timeout-error?
-  (record-predicate &port-write-timeout))
+  (record-predicate &port-write-timeout-error))
 
 (define (readable? port)
   "Test if PORT is writable."