Index: uspace/drv/test1/test1.c
===================================================================
--- uspace/drv/test1/test1.c	(revision 8b1e15ac9100f7b9da56e372d2f441ba44db6fcc)
+++ uspace/drv/test1/test1.c	(revision bab63886b1d1a9c8c49900dc50c39ee2b0c64763)
@@ -36,11 +36,11 @@
 #include "test1.h"
 
-static int add_device(device_t *dev);
+static int test1_add_device(device_t *dev);
 
 static driver_ops_t driver_ops = {
-	.add_device = &add_device
+	.add_device = &test1_add_device
 };
 
-static driver_t the_driver = {
+static driver_t test1_driver = {
 	.name = NAME,
 	.driver_ops = &driver_ops
@@ -55,5 +55,5 @@
  * @param score Device match score.
  */
-static void register_child_verbose(device_t *parent, const char *message,
+static void register_fun_verbose(device_t *parent, const char *message,
     const char *name, const char *match_id, int match_score)
 {
@@ -89,5 +89,5 @@
  * @return Error code reporting success of the operation.
  */
-static int add_device(device_t *dev)
+static int test1_add_device(device_t *dev)
 {
 	function_t *fun_a;
@@ -108,8 +108,8 @@
 		add_function_to_class(fun_a, "virt-null");
 	} else if (str_cmp(dev->name, "test1") == 0) {
-		register_child_verbose(dev, "cloning myself ;-)", "clone",
+		register_fun_verbose(dev, "cloning myself ;-)", "clone",
 		    "virtual&test1", 10);
 	} else if (str_cmp(dev->name, "clone") == 0) {
-		register_child_verbose(dev, "run by the same task", "child",
+		register_fun_verbose(dev, "run by the same task", "child",
 		    "virtual&test1&child", 10);
 	}
@@ -123,5 +123,5 @@
 {
 	printf(NAME ": HelenOS test1 virtual device driver\n");
-	return driver_main(&the_driver);
+	return driver_main(&test1_driver);
 }