diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3064037fcc..c25bfce5bc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,7 +27,7 @@ src/conf/netdev_vport_profile_conf.c
 src/conf/network_conf.c
 src/conf/networkcommon_conf.c
 src/conf/node_device_conf.c
-src/conf/numatune_conf.c
+src/conf/numa_conf.c
 src/conf/nwfilter_conf.c
 src/conf/nwfilter_params.c
 src/conf/object_event.c
diff --git a/src/Makefile.am b/src/Makefile.am
index a938d7ea7f..d38432ec2a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -275,7 +275,7 @@ DOMAIN_CONF_SOURCES =						\
 		conf/domain_audit.c conf/domain_audit.h		\
 		conf/domain_nwfilter.c conf/domain_nwfilter.h	\
 		conf/snapshot_conf.c conf/snapshot_conf.h	\
-		conf/numatune_conf.c conf/numatune_conf.h
+		conf/numa_conf.c conf/numa_conf.h
 
 OBJECT_EVENT_SOURCES =						\
 		conf/object_event.c conf/object_event.h \
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 325afa82c9..c45e303455 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -38,7 +38,7 @@
 # include "virsocketaddr.h"
 # include "networkcommon_conf.h"
 # include "nwfilter_params.h"
-# include "numatune_conf.h"
+# include "numa_conf.h"
 # include "virnetdevmacvlan.h"
 # include "virsysinfo.h"
 # include "virnetdevvportprofile.h"
diff --git a/src/conf/numatune_conf.c b/src/conf/numa_conf.c
similarity index 99%
rename from src/conf/numatune_conf.c
rename to src/conf/numa_conf.c
index d6cedaa5a8..0bbc136e59 100644
--- a/src/conf/numatune_conf.c
+++ b/src/conf/numa_conf.c
@@ -1,7 +1,7 @@
 /*
- * numatune_conf.c
+ * numa_conf.c
  *
- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (C) 2014-2015 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
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include "numatune_conf.h"
+#include "numa_conf.h"
 
 #include "domain_conf.h"
 #include "viralloc.h"
diff --git a/src/conf/numatune_conf.h b/src/conf/numa_conf.h
similarity index 96%
rename from src/conf/numatune_conf.h
rename to src/conf/numa_conf.h
index c4b3f6e698..4891f15694 100644
--- a/src/conf/numatune_conf.h
+++ b/src/conf/numa_conf.h
@@ -1,7 +1,7 @@
 /*
- * numatune_conf.h
+ * numa_conf.h
  *
- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (C) 2014-2015 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
@@ -20,8 +20,8 @@
  * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
-#ifndef __NUMATUNE_CONF_H__
-# define __NUMATUNE_CONF_H__
+#ifndef __NUMA_CONF_H__
+# define __NUMA_CONF_H__
 
 # include <libxml/xpath.h>
 
@@ -114,4 +114,4 @@ bool virDomainNumatuneNodesetIsAvailable(virDomainNumatunePtr numatune,
 
 bool virDomainNumatuneNodeSpecified(virDomainNumatunePtr numatune,
                                     int cellid);
-#endif /* __NUMATUNE_CONF_H__ */
+#endif /* __NUMA_CONF_H__ */
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 46a16136ca..96291953b1 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -625,7 +625,7 @@ virNodeDeviceObjRemove;
 virNodeDeviceObjUnlock;
 
 
-# conf/numatune_conf.h
+# conf/numa_conf.h
 virDomainNumatuneEquals;
 virDomainNumatuneFormatNodeset;
 virDomainNumatuneFormatXML;