diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
index 5899d72d3e..fd5021788f 100644
--- a/linux-user/Makefile.objs
+++ b/linux-user/Makefile.objs
@@ -1,5 +1,5 @@
 obj-y = main.o syscall.o strace.o mmap.o signal.o \
-	elfload.o linuxload.o uaccess.o cpu-uname.o
+	elfload.o linuxload.o uaccess.o uname.o
 
 obj-$(TARGET_HAS_BFLT) += flatload.o
 obj-$(TARGET_I386) += vm86.o
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index af0bb3565c..0f4a092a70 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -110,7 +110,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
 #include <linux/filter.h>
 #include <linux/blkpg.h>
 #include "linux_loop.h"
-#include "cpu-uname.h"
+#include "uname.h"
 
 #include "qemu.h"
 
diff --git a/linux-user/cpu-uname.c b/linux-user/uname.c
similarity index 99%
rename from linux-user/cpu-uname.c
rename to linux-user/uname.c
index 5db6e89567..26e90e5792 100644
--- a/linux-user/cpu-uname.c
+++ b/linux-user/uname.c
@@ -21,7 +21,7 @@
 
 #include "qemu.h"
 //#include "qemu-common.h"
-#include "cpu-uname.h"
+#include "uname.h"
 
 /* return highest utsname machine name for emulated instruction set
  *
diff --git a/linux-user/cpu-uname.h b/linux-user/uname.h
similarity index 100%
rename from linux-user/cpu-uname.h
rename to linux-user/uname.h