diff --git a/test/main.cpp b/test/main.cpp
index 965c556f..56c3bb20 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -12,7 +12,7 @@ void listen(uvw::Loop &loop) {
         std::cout << "error " << std::endl;
     });
 
-    tcp->once<uvw::ListenEvent>([](const uvw::ListenEvent &event, uvw::TcpHandle &srv) mutable {
+    tcp->once<uvw::ListenEvent>([](const uvw::ListenEvent &, uvw::TcpHandle &srv) mutable {
         std::cout << "listen" << std::endl;
 
         std::shared_ptr<uvw::TcpHandle> client = srv.loop().resource<uvw::TcpHandle>();
@@ -23,9 +23,7 @@ void listen(uvw::Loop &loop) {
 
         client->on<uvw::CloseEvent>([ptr = srv.shared_from_this()](const uvw::CloseEvent &, uvw::TcpHandle &) mutable {
             std::cout << "close" << std::endl;
-
-            uvw::TcpHandle &srv = *ptr;
-            srv.close();
+            ptr->close();
         });
 
         srv.accept(*client);
@@ -41,12 +39,12 @@ void listen(uvw::Loop &loop) {
             std::cout << "data length: " << event.length << std::endl;
         });
 
-        client->on<uvw::EndEvent>([](const uvw::EndEvent &, uvw::TcpHandle &client) {
+        client->on<uvw::EndEvent>([](const uvw::EndEvent &, uvw::TcpHandle &handle) {
             std::cout << "end" << std::endl;
             int count = 0;
-            client.loop().walk([&count](uvw::BaseHandle &handle) { ++count; });
+            handle.loop().walk([&count](uvw::BaseHandle &) { ++count; });
             std::cout << "still alive: " << count << " handles" << std::endl;
-            client.close();
+            handle.close();
         });
 
         client->read();
@@ -68,20 +66,20 @@ void conn(uvw::Loop &loop) {
         std::cout << "error " << std::endl;
     });
 
-    tcp->once<uvw::WriteEvent>([](const uvw::WriteEvent &, uvw::TcpHandle &tcp) mutable {
+    tcp->once<uvw::WriteEvent>([](const uvw::WriteEvent &, uvw::TcpHandle &handle) mutable {
         std::cout << "write" << std::endl;
-        tcp.close();
+        handle.close();
     });
 
-    tcp->once<uvw::ConnectEvent>([](const uvw::ConnectEvent &, uvw::TcpHandle &tcp) mutable {
+    tcp->once<uvw::ConnectEvent>([](const uvw::ConnectEvent &, uvw::TcpHandle &handle) mutable {
         std::cout << "connect" << std::endl;
 
         auto dataTryWrite = std::unique_ptr<char[]>(new char[1]{ 'a' });
-        int bw = tcp.tryWrite(std::move(dataTryWrite), 1);
+        int bw = handle.tryWrite(std::move(dataTryWrite), 1);
         std::cout << "written: " << ((int)bw) << std::endl;
 
         auto dataWrite = std::unique_ptr<char[]>(new char[2]{ 'b', 'c' });
-        tcp.write(std::move(dataWrite), 2);
+        handle.write(std::move(dataWrite), 2);
     });
 
     tcp->once<uvw::CloseEvent>([](const uvw::CloseEvent &, uvw::TcpHandle &) mutable {
diff --git a/test/uvw/async.cpp b/test/uvw/async.cpp
index 152113bb..ca57920b 100644
--- a/test/uvw/async.cpp
+++ b/test/uvw/async.cpp
@@ -14,11 +14,11 @@ TEST(Async, Send) {
         checkErrorEvent = true;
     });
 
-    handle->on<uvw::AsyncEvent>([&checkAsyncEvent](const auto &, auto &handle) {
+    handle->on<uvw::AsyncEvent>([&checkAsyncEvent](const auto &, auto &hndl) {
         ASSERT_FALSE(checkAsyncEvent);
         checkAsyncEvent = true;
-        handle.close();
-        ASSERT_TRUE(handle.closing());
+        hndl.close();
+        ASSERT_TRUE(hndl.closing());
     });
 
     handle->send();
diff --git a/test/uvw/check.cpp b/test/uvw/check.cpp
index 9142468f..b26a439b 100644
--- a/test/uvw/check.cpp
+++ b/test/uvw/check.cpp
@@ -14,12 +14,12 @@ TEST(Check, StartAndStop) {
         checkErrorEvent = true;
     });
 
-    handle->on<uvw::CheckEvent>([&checkCheckEvent](const auto &, auto &handle) {
+    handle->on<uvw::CheckEvent>([&checkCheckEvent](const auto &, auto &hndl) {
         ASSERT_FALSE(checkCheckEvent);
         checkCheckEvent = true;
-        handle.stop();
-        handle.close();
-        ASSERT_TRUE(handle.closing());
+        hndl.stop();
+        hndl.close();
+        ASSERT_TRUE(hndl.closing());
     });
 
     handle->start();
diff --git a/test/uvw/file_req.cpp b/test/uvw/file_req.cpp
index 850eaac6..ea04a373 100644
--- a/test/uvw/file_req.cpp
+++ b/test/uvw/file_req.cpp
@@ -21,15 +21,15 @@ TEST(FileReq, OpenAndClose) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::CLOSE>>([&checkFileCloseEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::CLOSE>>([&checkFileCloseEvent](const auto &, auto &) {
         ASSERT_FALSE(checkFileCloseEvent);
         checkFileCloseEvent = true;
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([&checkFileOpenEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([&checkFileOpenEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileOpenEvent);
         checkFileOpenEvent = true;
-        request.close();
+        req.close();
     });
 
     request->open(filename, O_CREAT | O_WRONLY, 0644);
@@ -67,21 +67,21 @@ TEST(FileReq, RWChecked) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::READ>>([&checkFileReadEvent](const auto &event, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::READ>>([&checkFileReadEvent](const auto &event, auto &req) {
         ASSERT_FALSE(checkFileReadEvent);
         ASSERT_EQ(event.data[0], 42);
         checkFileReadEvent = true;
-        request.close();
+        req.close();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::WRITE>>([&checkFileWriteEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::WRITE>>([&checkFileWriteEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileWriteEvent);
         checkFileWriteEvent = true;
-        request.read(0, 1);
+        req.read(0, 1);
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &request) {
-        request.write(std::unique_ptr<char[]>{new char[1]{ 42 }}, 1, 0);
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &req) {
+        req.write(std::unique_ptr<char[]>{new char[1]{ 42 }}, 1, 0);
     });
 
     request->open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
@@ -107,21 +107,21 @@ TEST(FileReq, RWUnchecked) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::READ>>([&checkFileReadEvent](const auto &event, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::READ>>([&checkFileReadEvent](const auto &event, auto &req) {
         ASSERT_FALSE(checkFileReadEvent);
         ASSERT_EQ(event.data[0], 42);
         checkFileReadEvent = true;
-        request.close();
+        req.close();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::WRITE>>([&checkFileWriteEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::WRITE>>([&checkFileWriteEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileWriteEvent);
         checkFileWriteEvent = true;
-        request.read(0, 1);
+        req.read(0, 1);
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([&data](const auto &, auto &request) {
-        request.write(data.get(), 1, 0);
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([&data](const auto &, auto &req) {
+        req.write(data.get(), 1, 0);
     });
 
     request->open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
@@ -170,14 +170,14 @@ TEST(FileReq, Stat) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::FSTAT>>([&checkFileStatEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::FSTAT>>([&checkFileStatEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileStatEvent);
         checkFileStatEvent = true;
-        request.close();
+        req.close();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &request) {
-        request.stat();
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &req) {
+        req.stat();
     });
 
     request->open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
@@ -218,14 +218,14 @@ TEST(FileReq, Sync) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::FSYNC>>([&checkFileSyncEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::FSYNC>>([&checkFileSyncEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileSyncEvent);
         checkFileSyncEvent = true;
-        request.close();
+        req.close();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &request) {
-        request.sync();
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &req) {
+        req.sync();
     });
 
     request->open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
@@ -262,14 +262,14 @@ TEST(FileReq, Datasync) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::FDATASYNC>>([&checkFileDatasyncEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::FDATASYNC>>([&checkFileDatasyncEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileDatasyncEvent);
         checkFileDatasyncEvent = true;
-        request.close();
+        req.close();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &request) {
-        request.datasync();
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &req) {
+        req.datasync();
     });
 
     request->open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
@@ -306,14 +306,14 @@ TEST(FileReq, Truncate) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::FTRUNCATE>>([&checkFileTruncateEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::FTRUNCATE>>([&checkFileTruncateEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileTruncateEvent);
         checkFileTruncateEvent = true;
-        request.close();
+        req.close();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &request) {
-        request.truncate(0);
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &req) {
+        req.truncate(0);
     });
 
     request->open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
@@ -362,14 +362,14 @@ TEST(FileReq, Chmod) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::FCHMOD>>([&checkFileChmodEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::FCHMOD>>([&checkFileChmodEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileChmodEvent);
         checkFileChmodEvent = true;
-        request.close();
+        req.close();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &request) {
-        request.chmod(0644);
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &req) {
+        req.chmod(0644);
     });
 
     request->open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
@@ -406,17 +406,17 @@ TEST(FileReq, Utime) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::FUTIME>>([&checkFileUtimeEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::FUTIME>>([&checkFileUtimeEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileUtimeEvent);
         checkFileUtimeEvent = true;
-        request.close();
+        req.close();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &req) {
         auto now = std::chrono::system_clock::now();
         auto epoch = now.time_since_epoch();
         auto value = std::chrono::duration_cast<std::chrono::seconds>(epoch);
-        request.utime(value, value);
+        req.utime(value, value);
     });
 
     request->open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
@@ -459,18 +459,18 @@ TEST(FileReq, Chown) {
         FAIL();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::FCHOWN>>([&checkFileChownEvent](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FileReq::Type::FCHOWN>>([&checkFileChownEvent](const auto &, auto &req) {
         ASSERT_FALSE(checkFileChownEvent);
         checkFileChownEvent = true;
-        request.close();
+        req.close();
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::FSTAT>>([](const auto &event, auto &request) {
-        request.chown(event.stat.st_uid, event.stat.st_gid);
+    request->on<uvw::FsEvent<uvw::FileReq::Type::FSTAT>>([](const auto &event, auto &req) {
+        req.chown(event.stat.st_uid, event.stat.st_gid);
     });
 
-    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &request) {
-        request.stat();
+    request->on<uvw::FsEvent<uvw::FileReq::Type::OPEN>>([](const auto &, auto &req) {
+        req.stat();
     });
 
     request->open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
diff --git a/test/uvw/fs_req.cpp b/test/uvw/fs_req.cpp
index c0aaf3e9..e6e91f4a 100644
--- a/test/uvw/fs_req.cpp
+++ b/test/uvw/fs_req.cpp
@@ -26,10 +26,10 @@ TEST(FsReq, MkdirAndRmdir) {
         checkFsRmdirEvent = true;
     });
 
-    request->on<uvw::FsEvent<uvw::FsReq::Type::MKDIR>>([&checkFsMkdirEvent, &dirname](const auto &, auto &request) {
+    request->on<uvw::FsEvent<uvw::FsReq::Type::MKDIR>>([&checkFsMkdirEvent, &dirname](const auto &, auto &req) {
         ASSERT_FALSE(checkFsMkdirEvent);
         checkFsMkdirEvent = true;
-        request.rmdir(dirname);
+        req.rmdir(dirname);
     });
 
     request->mkdir(dirname, 0755);
@@ -72,11 +72,11 @@ TEST(FsReq, MkdtempAndRmdir) {
         checkFsRmdirEvent = true;
     });
 
-    request->on<uvw::FsEvent<uvw::FsReq::Type::MKDTEMP>>([&checkFsMkdtempEvent](const auto &event, auto &request) {
+    request->on<uvw::FsEvent<uvw::FsReq::Type::MKDTEMP>>([&checkFsMkdtempEvent](const auto &event, auto &req) {
         ASSERT_FALSE(checkFsMkdtempEvent);
         ASSERT_NE(event.path, nullptr);
         checkFsMkdtempEvent = true;
-        request.rmdir(event.path);
+        req.rmdir(event.path);
     });
 
     request->mkdtemp(dirname);
diff --git a/test/uvw/idle.cpp b/test/uvw/idle.cpp
index 7a027097..e4afb344 100644
--- a/test/uvw/idle.cpp
+++ b/test/uvw/idle.cpp
@@ -14,12 +14,12 @@ TEST(Idle, StartAndStop) {
         checkErrorEvent = true;
     });
 
-    handle->on<uvw::IdleEvent>([&checkIdleEvent](const auto &, auto &handle) {
+    handle->on<uvw::IdleEvent>([&checkIdleEvent](const auto &, auto &hndl) {
         ASSERT_FALSE(checkIdleEvent);
         checkIdleEvent = true;
-        handle.stop();
-        handle.close();
-        ASSERT_TRUE(handle.closing());
+        hndl.stop();
+        hndl.close();
+        ASSERT_TRUE(hndl.closing());
     });
 
     handle->start();
diff --git a/test/uvw/loop.cpp b/test/uvw/loop.cpp
index 051839f9..0298eefc 100644
--- a/test/uvw/loop.cpp
+++ b/test/uvw/loop.cpp
@@ -34,14 +34,14 @@ TEST(Loop, PartiallyDone) {
     ASSERT_FALSE(loop->alive());
 
     handle->start();
-    handle->on<uvw::PrepareEvent>([](const auto &, auto &handle) {
-        handle.loop().walk([](uvw::BaseHandle &) {
+    handle->on<uvw::PrepareEvent>([](const auto &, auto &hndl) {
+        hndl.loop().walk([](uvw::BaseHandle &) {
             static bool trigger = true;
             ASSERT_TRUE(trigger);
             trigger = false;
         });
 
-        handle.close();
+        hndl.close();
     });
 
     ASSERT_TRUE(loop->alive());
diff --git a/test/uvw/prepare.cpp b/test/uvw/prepare.cpp
index e81404e8..f2c39c96 100644
--- a/test/uvw/prepare.cpp
+++ b/test/uvw/prepare.cpp
@@ -14,12 +14,12 @@ TEST(Prepare, StartAndStop) {
         checkErrorEvent = true;
     });
 
-    handle->on<uvw::PrepareEvent>([&checkPrepareEvent](const auto &, auto &handle) {
+    handle->on<uvw::PrepareEvent>([&checkPrepareEvent](const auto &, auto &hndl) {
         ASSERT_FALSE(checkPrepareEvent);
         checkPrepareEvent = true;
-        handle.stop();
-        handle.close();
-        ASSERT_TRUE(handle.closing());
+        hndl.stop();
+        hndl.close();
+        ASSERT_TRUE(hndl.closing());
     });
 
     handle->start();
diff --git a/test/uvw/timer.cpp b/test/uvw/timer.cpp
index 41fc5511..20ae4308 100644
--- a/test/uvw/timer.cpp
+++ b/test/uvw/timer.cpp
@@ -69,19 +69,19 @@ TEST(Timer, Again) {
         checkErrorEvent = true;
     });
 
-    handle->on<uvw::TimerEvent>([&checkTimerEvent](const auto &, auto &handle) {
+    handle->on<uvw::TimerEvent>([&checkTimerEvent](const auto &, auto &hndl) {
         static bool guard = false;
 
         if(guard) {
-            handle.stop();
-            handle.close();
+            hndl.stop();
+            hndl.close();
             checkTimerEvent = true;
-            ASSERT_TRUE(handle.closing());
+            ASSERT_TRUE(hndl.closing());
         } else {
             guard = true;
-            handle.again();
-            ASSERT_EQ(handle.repeat(), uvw::TimerHandle::Time{1});
-            ASSERT_FALSE(handle.closing());
+            hndl.again();
+            ASSERT_EQ(hndl.repeat(), uvw::TimerHandle::Time{1});
+            ASSERT_FALSE(hndl.closing());
         }
     });