diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8354c09abfb71f4f2ff1f9c5dee42a20e7d40ed3..145ea515414bbf3d94953f55281a112850f85976 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -106,7 +106,6 @@ src/storage/storage_driver.c
 src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
-src/util/authhelper.c
 src/util/cgroup.c
 src/util/command.c
 src/util/conf.c
@@ -125,6 +124,7 @@ src/util/storage_file.c
 src/util/sysinfo.c
 src/util/util.c
 src/util/viraudit.c
+src/util/virauth.c
 src/util/virfile.c
 src/util/virhash.c
 src/util/virkeyfile.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 07d7faa4cbd4ef7e7f6d1288a48b6c24156e432a..3cbf9d7ba65dddfd99f237639055b784b249e1b5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =							\
-		util/authhelper.c util/authhelper.h		\
 		util/bitmap.c util/bitmap.h			\
 		util/buf.c util/buf.h				\
 		util/command.c util/command.h			\
@@ -81,6 +80,7 @@ UTIL_SOURCES =							\
 		util/uuid.c util/uuid.h				\
 		util/util.c util/util.h				\
 		util/viraudit.c util/viraudit.h			\
+		util/virauth.c util/virauth.h			\
 		util/virfile.c util/virfile.h			\
 		util/virnodesuspend.c util/virnodesuspend.h	\
 		util/virpidfile.c util/virpidfile.h		\
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 7e41fa32cdaf696e61140f23f692502caec734de..51bd5b2e89bca4bc57a115cc8ac3dfd58c55cede 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -26,7 +26,7 @@
 
 #include "internal.h"
 #include "domain_conf.h"
-#include "authhelper.h"
+#include "virauth.h"
 #include "util.h"
 #include "memory.h"
 #include "logging.h"
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 27c8747cc28331f488fa74684413c783fbeb55b1..5ca20cf73cafbe1d1a9cf81615c12c6eca3787ee 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "datatypes.h"
 #include "domain_conf.h"
-#include "authhelper.h"
+#include "virauth.h"
 #include "util.h"
 #include "memory.h"
 #include "logging.h"
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index bdf4a7bfd4989b055a27f9b855d0364a2a44a281..4b99465850a241461e0d38b4a7c15a60658d17b9 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -44,7 +44,7 @@
 #include <domain_event.h>
 
 #include "internal.h"
-#include "authhelper.h"
+#include "virauth.h"
 #include "util.h"
 #include "datatypes.h"
 #include "buf.h"
diff --git a/src/util/authhelper.c b/src/util/virauth.c
similarity index 97%
rename from src/util/authhelper.c
rename to src/util/virauth.c
index 9398cb3e95e9bf0325efcc5506898db2c5f0d1b1..a3c6b94f394f78804d2d783d76eab13f8d9923f3 100644
--- a/src/util/authhelper.c
+++ b/src/util/virauth.c
@@ -1,6 +1,5 @@
-
 /*
- * authhelper.c: authentication related utility functions
+ * virauth.c: authentication related utility functions
  *
  * Copyright (C) 2010 Matthias Bolte <matthias.bolte@googlemail.com>
  *
@@ -22,7 +21,7 @@
 
 #include <config.h>
 
-#include "authhelper.h"
+#include "virauth.h"
 #include "util.h"
 #include "memory.h"
 
diff --git a/src/util/authhelper.h b/src/util/virauth.h
similarity index 87%
rename from src/util/authhelper.h
rename to src/util/virauth.h
index ca45d16c03b9ccec829bbd9c8635e81722c3b56d..2c8d80f556ac1878cd1010164f739e542225ce3a 100644
--- a/src/util/authhelper.h
+++ b/src/util/virauth.h
@@ -1,6 +1,5 @@
-
 /*
- * authhelper.h: authentication related utility functions
+ * virauth.h: authentication related utility functions
  *
  * Copyright (C) 2010 Matthias Bolte <matthias.bolte@googlemail.com>
  *
@@ -20,8 +19,8 @@
  *
  */
 
-#ifndef __VIR_AUTHHELPER_H__
-# define __VIR_AUTHHELPER_H__
+#ifndef __VIR_AUTH_H__
+# define __VIR_AUTH_H__
 
 # include "internal.h"
 
@@ -30,4 +29,4 @@ char *virRequestUsername(virConnectAuthPtr auth, const char *defaultUsername,
 char *virRequestPassword(virConnectAuthPtr auth, const char *username,
                          const char *hostname);
 
-#endif /* __VIR_AUTHHELPER_H__ */
+#endif /* __VIR_AUTH_H__ */
diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 298db1220f1b498c3e094badf851be38efa2f0d8..8d261ef5f57d9266dfdfe864c5157f1a1f43f912 100644
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -31,7 +31,7 @@
 #include "domain_conf.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "authhelper.h"
+#include "virauth.h"
 #include "util.h"
 #include "uuid.h"
 #include "memory.h"