diff --git a/repos/os/src/test/nic_router_dhcp/client/nic.cc b/repos/os/src/test/nic_router_dhcp/client/nic.cc
index dd835d63e3..87e2a9952b 100644
--- a/repos/os/src/test/nic_router_dhcp/client/nic.cc
+++ b/repos/os/src/test/nic_router_dhcp/client/nic.cc
@@ -18,14 +18,14 @@ using namespace Net;
 using namespace Genode;
 
 
-void Net::Nic::_ready_to_ack()
+void Net::Nic::_handle_source()
 {
 	while (_source().ack_avail()) {
 		_source().release_packet(_source().get_acked_packet()); }
 }
 
 
-void Net::Nic::_ready_to_submit()
+void Net::Nic::_handle_sink()
 {
 	while (_sink().packet_avail()) {
 
diff --git a/repos/os/src/test/nic_router_dhcp/client/nic.h b/repos/os/src/test/nic_router_dhcp/client/nic.h
index b874c7f808..5005cd5360 100644
--- a/repos/os/src/test/nic_router_dhcp/client/nic.h
+++ b/repos/os/src/test/nic_router_dhcp/client/nic.h
@@ -61,10 +61,8 @@ class Net::Nic
 		bool             const &_verbose;
 		::Nic::Packet_allocator _pkt_alloc          { &_alloc };
 		::Nic::Connection       _nic                { _env, &_pkt_alloc, BUF_SIZE, BUF_SIZE };
-		Signal_handler          _sink_ack           { _env.ep(), *this, &Nic::_ack_avail };
-		Signal_handler          _sink_submit        { _env.ep(), *this, &Nic::_ready_to_submit };
-		Signal_handler          _source_ack         { _env.ep(), *this, &Nic::_ready_to_ack };
-		Signal_handler          _source_submit      { _env.ep(), *this, &Nic::_packet_avail };
+		Signal_handler          _sink_handler       { _env.ep(), *this, &Nic::_handle_sink };
+		Signal_handler          _source_handler     { _env.ep(), *this, &Nic::_handle_source };
 		Signal_handler          _link_state_handler { _env.ep(), *this, &Nic::handle_link_state };
 		Mac_address      const  _mac                { _nic.mac_address() };
 
@@ -76,10 +74,8 @@ class Net::Nic
 		 ** Packet-stream signal handlers **
 		 ***********************************/
 
-		void _ready_to_submit();
-		void _ack_avail() { }
-		void _ready_to_ack();
-		void _packet_avail() { }
+		void _handle_sink();
+		void _handle_source();
 
 	public:
 
@@ -93,10 +89,10 @@ class Net::Nic
 			_handler (handler),
 			_verbose (verbose)
 		{
-			_nic.rx_channel()->sigh_ready_to_ack(_sink_ack);
-			_nic.rx_channel()->sigh_packet_avail(_sink_submit);
-			_nic.tx_channel()->sigh_ack_avail(_source_ack);
-			_nic.tx_channel()->sigh_ready_to_submit(_source_submit);
+			_nic.rx_channel()->sigh_ready_to_ack(_sink_handler);
+			_nic.rx_channel()->sigh_packet_avail(_sink_handler);
+			_nic.tx_channel()->sigh_ack_avail(_source_handler);
+			_nic.tx_channel()->sigh_ready_to_submit(_source_handler);
 			_nic.link_state_sigh(_link_state_handler);
 		}