diff --git a/usb/ehci/Makefile b/usb/ehci/Makefile
index 2f2b837c..3b7cf5a0 100644
--- a/usb/ehci/Makefile
+++ b/usb/ehci/Makefile
@@ -1,13 +1,12 @@
 #
-# Makefile for Phoenix-RTOS imx6ull-ehci
+# Makefile for Phoenix-RTOS ehci
 #
 # Copyright 2018, 2019 Phoenix Systems
 #
 
 # FIXME: rename usb host component
 NAME := libusbehci
-# TODO use TARGET_FAMILY-TARGET_SUBFAMILY
-LOCAL_SRCS := ehci.c ehci-hub.c phy-$(TARGET_SUBFAMILY).c
+LOCAL_SRCS := ehci.c ehci-hub.c phy-$(TARGET_FAMILY)-$(TARGET_SUBFAMILY).c
 
 ifneq (,$(findstring imx,$(TARGET_SUBFAMILY)))
  CFLAGS += -DEHCI_IMX
diff --git a/usb/ehci/phy-imx6ull.c b/usb/ehci/phy-armv7a7-imx6ull.c
similarity index 100%
rename from usb/ehci/phy-imx6ull.c
rename to usb/ehci/phy-armv7a7-imx6ull.c
diff --git a/usb/ehci/phy-imxrt106x.c b/usb/ehci/phy-armv7m7-imxrt106x.c
similarity index 100%
rename from usb/ehci/phy-imxrt106x.c
rename to usb/ehci/phy-armv7m7-imxrt106x.c
diff --git a/usb/ehci/phy-imxrt117x.c b/usb/ehci/phy-armv7m7-imxrt117x.c
similarity index 100%
rename from usb/ehci/phy-imxrt117x.c
rename to usb/ehci/phy-armv7m7-imxrt117x.c
diff --git a/usb/ehci/phy-generic.c b/usb/ehci/phy-ia32-generic.c
similarity index 100%
rename from usb/ehci/phy-generic.c
rename to usb/ehci/phy-ia32-generic.c