Index: uspace/lib/c/generic/ns.c
===================================================================
--- uspace/lib/c/generic/ns.c	(revision abf2dfde554829308532f8d95a182c0db6fcf54c)
+++ uspace/lib/c/generic/ns.c	(revision 6a8ce16e9d7ca696b63ae994c87911928c450d62)
@@ -49,5 +49,5 @@
 }
 
-async_sess_t *service_connect(exch_mgmt_t mgmt, services_t service, sysarg_t arg2,
+async_sess_t *service_connect(exch_mgmt_t mgmt, service_t service, sysarg_t arg2,
     sysarg_t arg3)
 {
@@ -73,5 +73,5 @@
 }
 
-async_sess_t *service_connect_blocking(exch_mgmt_t mgmt, services_t service,
+async_sess_t *service_connect_blocking(exch_mgmt_t mgmt, service_t service,
     sysarg_t arg2, sysarg_t arg3)
 {
@@ -108,5 +108,5 @@
  *
  */
-async_sess_t *service_bind(services_t service, sysarg_t arg1, sysarg_t arg2,
+async_sess_t *service_bind(service_t service, sysarg_t arg1, sysarg_t arg2,
     sysarg_t arg3, async_port_handler_t client_receiver)
 {
Index: uspace/lib/c/include/ipc/services.h
===================================================================
--- uspace/lib/c/include/ipc/services.h	(revision abf2dfde554829308532f8d95a182c0db6fcf54c)
+++ uspace/lib/c/include/ipc/services.h	(revision 6a8ce16e9d7ca696b63ae994c87911928c450d62)
@@ -50,5 +50,5 @@
 	SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),
 	SERVICE_CLIPBOARD  = FOURCC('c', 'l', 'i', 'p'),
-} services_t;
+} service_t;
 
 #define SERVICE_NAME_CORECFG	"corecfg"
Index: uspace/lib/c/include/ns.h
===================================================================
--- uspace/lib/c/include/ns.h	(revision abf2dfde554829308532f8d95a182c0db6fcf54c)
+++ uspace/lib/c/include/ns.h	(revision 6a8ce16e9d7ca696b63ae994c87911928c450d62)
@@ -42,8 +42,8 @@
 
 extern int service_register(sysarg_t);
-extern async_sess_t *service_connect(exch_mgmt_t, services_t, sysarg_t, sysarg_t);
-extern async_sess_t *service_connect_blocking(exch_mgmt_t, services_t, sysarg_t,
+extern async_sess_t *service_connect(exch_mgmt_t, service_t, sysarg_t, sysarg_t);
+extern async_sess_t *service_connect_blocking(exch_mgmt_t, service_t, sysarg_t,
     sysarg_t);
-extern async_sess_t *service_bind(services_t, sysarg_t, sysarg_t, sysarg_t,
+extern async_sess_t *service_bind(service_t, sysarg_t, sysarg_t, sysarg_t,
     async_port_handler_t);
 
Index: uspace/srv/ns/ns.c
===================================================================
--- uspace/srv/ns/ns.c	(revision abf2dfde554829308532f8d95a182c0db6fcf54c)
+++ uspace/srv/ns/ns.c	(revision 6a8ce16e9d7ca696b63ae994c87911928c450d62)
@@ -38,4 +38,5 @@
 #include <ipc/ipc.h>
 #include <ipc/ns.h>
+#include <ipc/services.h>
 #include <stdio.h>
 #include <errno.h>
@@ -73,4 +74,7 @@
 		sysarg_t retval;
 		
+		service_t service;
+		sysarg_t phone;
+		
 		switch (IPC_GET_IMETHOD(call)) {
 		case IPC_M_PHONE_HUNGUP:
@@ -78,27 +82,28 @@
 			break;
 		case IPC_M_CONNECT_TO_ME:
+			service = IPC_GET_ARG1(call);
+			phone = IPC_GET_ARG5(call);
+			
 			/*
 			 * Server requests service registration.
 			 */
-			if (service_clonable(IPC_GET_ARG1(call))) {
-				register_clonable(IPC_GET_ARG1(call),
-				    IPC_GET_ARG5(call), &call, callid);
+			if (service_clonable(service)) {
+				register_clonable(service, phone, &call, callid);
 				continue;
-			} else {
-				retval = register_service(IPC_GET_ARG1(call),
-				    IPC_GET_ARG5(call), &call);
-			}
+			} else
+				retval = register_service(service, phone, &call);
+			
 			break;
 		case IPC_M_CONNECT_ME_TO:
+			service = IPC_GET_ARG1(call);
+			
 			/*
 			 * Client requests to be connected to a service.
 			 */
-			if (service_clonable(IPC_GET_ARG1(call))) {
-				connect_to_clonable(IPC_GET_ARG1(call),
-				    &call, callid);
+			if (service_clonable(service)) {
+				connect_to_clonable(service, &call, callid);
 				continue;
 			} else {
-				connect_to_service(IPC_GET_ARG1(call), &call,
-				    callid);
+				connect_to_service(service, &call, callid);
 				continue;
 			}