diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index be1b5a940d..9edaf5f696 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -128,7 +128,7 @@ libvirtd_conf_la_LIBADD = $(LIBXML_LIBS)
 
 noinst_LTLIBRARIES += libvirtd_admin.la
 libvirtd_admin_la_SOURCES = \
-		admin_server.c admin_server.h
+		admin.c admin.h
 
 libvirtd_admin_la_CFLAGS = \
 		$(AM_CFLAGS)		\
@@ -319,7 +319,8 @@ endif ! WITH_POLKIT
 
 remote.c: $(DAEMON_GENERATED)
 remote.h: $(DAEMON_GENERATED)
-admin_server.c: $(DAEMON_GENERATED)
+admin.c: $(DAEMON_GENERATED)
+admin.h: $(DAEMON_GENERATED)
 
 LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
 		  libvirtd.libxl.logrotate libvirtd.uml.logrotate \
diff --git a/daemon/admin_server.c b/daemon/admin.c
similarity index 96%
rename from daemon/admin_server.c
rename to daemon/admin.c
index 189091e75a..fa6caf337e 100644
--- a/daemon/admin_server.c
+++ b/daemon/admin.c
@@ -1,7 +1,7 @@
 /*
- * admin_server.c:
+ * admin.c: handlers for admin RPC method calls
  *
- * Copyright (C) 2014-2015 Red Hat, Inc.
+ * Copyright (C) 2014-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 #include "libvirt_internal.h"
 
 #include "admin_protocol.h"
-#include "admin_server.h"
+#include "admin.h"
 #include "datatypes.h"
 #include "viralloc.h"
 #include "virerror.h"
diff --git a/daemon/admin_server.h b/daemon/admin.h
similarity index 92%
rename from daemon/admin_server.h
rename to daemon/admin.h
index 26721a6d58..c869cc7aab 100644
--- a/daemon/admin_server.h
+++ b/daemon/admin.h
@@ -1,7 +1,7 @@
 /*
- * admin_server.h
+ * admin.h: handlers for admin RPC method calls
  *
- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (C) 2014-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index a747553bfb..d1b98c9c3d 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -44,7 +44,7 @@
 #include "libvirtd.h"
 #include "libvirtd-config.h"
 
-#include "admin_server.h"
+#include "admin.h"
 #include "viruuid.h"
 #include "remote_driver.h"
 #include "viralloc.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 923d288398..171d2b1e15 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,5 @@
 daemon/admin_dispatch.h
-daemon/admin_server.c
+daemon/admin.c
 daemon/libvirtd-config.c
 daemon/libvirtd.c
 daemon/qemu_dispatch.h