diff --git a/group/tf-l1-build-plat/diphda-fpga-default:nil b/group/tf-l1-build-plat/corstone1000-fpga-default:nil
similarity index 100%
rename from group/tf-l1-build-plat/diphda-fpga-default:nil
rename to group/tf-l1-build-plat/corstone1000-fpga-default:nil
diff --git a/group/tf-l1-build-plat/diphda-fpga-default:nil b/group/tf-l1-build-plat/corstone1000-fvp-default:nil
similarity index 100%
copy from group/tf-l1-build-plat/diphda-fpga-default:nil
copy to group/tf-l1-build-plat/corstone1000-fvp-default:nil
diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index 7cf2850..5245630 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -278,11 +278,11 @@
 clean_build $(common_flags) PLAT=morello TARGET_PLATFORM=soc ${ARM_TBB_OPTIONS}
 
 #
-# diphda Platform
+# corstone1000 Platform
 #
 
 make $(common_flags) \
-     PLAT=diphda \
+     PLAT=corstone1000 \
      SPD=spmd \
      TARGET_PLATFORM=fpga \
      ENABLE_STACK_PROTECTOR=strong \
diff --git a/tf_config/diphda-fpga-default b/tf_config/corstone1000-fpga-default
similarity index 92%
rename from tf_config/diphda-fpga-default
rename to tf_config/corstone1000-fpga-default
index 303d070..df7899e 100644
--- a/tf_config/diphda-fpga-default
+++ b/tf_config/corstone1000-fpga-default
@@ -3,9 +3,9 @@
 CROSS_COMPILE=aarch64-none-elf-
 ENABLE_PIE=1
 GENERATE_COT=1
-PLAT=diphda
+PLAT=corstone1000
 ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
 SPD=spmd
 SPMD_SPM_AT_SEL2=0
 TARGET_PLATFORM=fpga
-TRUSTED_BOARD_BOOT=1
\ No newline at end of file
+TRUSTED_BOARD_BOOT=1
diff --git a/tf_config/diphda-fpga-default b/tf_config/corstone1000-fvp-default
similarity index 92%
copy from tf_config/diphda-fpga-default
copy to tf_config/corstone1000-fvp-default
index 303d070..df7899e 100644
--- a/tf_config/diphda-fpga-default
+++ b/tf_config/corstone1000-fvp-default
@@ -3,9 +3,9 @@
 CROSS_COMPILE=aarch64-none-elf-
 ENABLE_PIE=1
 GENERATE_COT=1
-PLAT=diphda
+PLAT=corstone1000
 ROT_KEY=plat/arm/board/common/rotpk/arm_rotprivk_rsa.pem
 SPD=spmd
 SPMD_SPM_AT_SEL2=0
 TARGET_PLATFORM=fpga
-TRUSTED_BOARD_BOOT=1
\ No newline at end of file
+TRUSTED_BOARD_BOOT=1