diff --git a/drivers/CpuUid.cpp b/drivers/DeviceUid.cpp
similarity index 100%
rename from drivers/CpuUid.cpp
rename to drivers/DeviceUid.cpp
diff --git a/drivers/CpuUid.h b/drivers/DeviceUid.h
similarity index 100%
rename from drivers/CpuUid.h
rename to drivers/DeviceUid.h
diff --git a/hal/cpu_uid_api.h b/hal/device_uid_api.h
similarity index 100%
rename from hal/cpu_uid_api.h
rename to hal/device_uid_api.h
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/cpu_uid_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/device_uid_api.c
similarity index 100%
rename from targets/TARGET_NORDIC/TARGET_NRF5/cpu_uid_api.c
rename to targets/TARGET_NORDIC/TARGET_NRF5/device_uid_api.c
diff --git a/targets/TARGET_STM/cpu_uid_api.c b/targets/TARGET_STM/device_uid_api.c
similarity index 100%
rename from targets/TARGET_STM/cpu_uid_api.c
rename to targets/TARGET_STM/device_uid_api.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/cpu_uid_api.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/device_uid_api.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/cpu_uid_api.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/device_uid_api.c