diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs
index 6ead7820c4..cb77dc3793 100644
--- a/hw/xtensa/Makefile.objs
+++ b/hw/xtensa/Makefile.objs
@@ -1,3 +1,3 @@
 obj-y += pic_cpu.o
-obj-y += xtensa_sim.o
-obj-y += xtensa_lx60.o
+obj-y += sim.o
+obj-y += xtfpga.o
diff --git a/hw/xtensa/xtensa_bootparam.h b/hw/xtensa/bootparam.h
similarity index 100%
rename from hw/xtensa/xtensa_bootparam.h
rename to hw/xtensa/bootparam.h
diff --git a/hw/xtensa/xtensa_sim.c b/hw/xtensa/sim.c
similarity index 100%
rename from hw/xtensa/xtensa_sim.c
rename to hw/xtensa/sim.c
diff --git a/hw/xtensa/xtensa_lx60.c b/hw/xtensa/xtfpga.c
similarity index 99%
rename from hw/xtensa/xtensa_lx60.c
rename to hw/xtensa/xtfpga.c
index 183527f6a7..0b8a2eda06 100644
--- a/hw/xtensa/xtensa_lx60.c
+++ b/hw/xtensa/xtfpga.c
@@ -37,7 +37,7 @@
 #include "hw/block/flash.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/char.h"
-#include "xtensa_bootparam.h"
+#include "bootparam.h"
 
 typedef struct LxBoardDesc {
     hwaddr flash_base;