Index: uspace/lib/drv/generic/remote_battery_dev.c
===================================================================
--- uspace/lib/drv/generic/remote_battery_dev.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
+++ uspace/lib/drv/generic/remote_battery_dev.c	(revision 77f0a1d4bb8b6671f79bcf1c047b1bb9ada543c9)
@@ -118,5 +118,5 @@
  */
 static void
-remote_battery_status_get(ddf_fun_t *fun, void *ops, cap_call_handle_t callid,
+remote_battery_status_get(ddf_fun_t *fun, void *ops, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -124,5 +124,5 @@
 
 	if (bops->battery_status_get == NULL) {
-		async_answer_0(callid, ENOTSUP);
+		async_answer_0(chandle, ENOTSUP);
 		return;
 	}
@@ -132,7 +132,7 @@
 
 	if (rc != EOK)
-		async_answer_0(callid, rc);
+		async_answer_0(chandle, rc);
 	else
-		async_answer_1(callid, rc, batt_status);
+		async_answer_1(chandle, rc, batt_status);
 }
 
@@ -144,5 +144,5 @@
  */
 static void
-remote_battery_charge_level_get(ddf_fun_t *fun, void *ops, cap_call_handle_t callid,
+remote_battery_charge_level_get(ddf_fun_t *fun, void *ops, cap_call_handle_t chandle,
     ipc_call_t *call)
 {
@@ -150,5 +150,5 @@
 
 	if (bops->battery_charge_level_get == NULL) {
-		async_answer_0(callid, ENOTSUP);
+		async_answer_0(chandle, ENOTSUP);
 		return;
 	}
@@ -158,7 +158,7 @@
 
 	if (rc != EOK)
-		async_answer_0(callid, rc);
+		async_answer_0(chandle, rc);
 	else
-		async_answer_1(callid, rc, battery_level);
+		async_answer_1(chandle, rc, battery_level);
 }