diff --git a/docs/resources/diagrams/plantuml/fconf_bl1_load_config.puml b/docs/resources/diagrams/plantuml/fconf_bl1_load_config.puml
index c36e544..e613eef 100644
--- a/docs/resources/diagrams/plantuml/fconf_bl1_load_config.puml
+++ b/docs/resources/diagrams/plantuml/fconf_bl1_load_config.puml
@@ -24,9 +24,9 @@
 activate fconf
 	note over fconf
 		create and populate an
-		image_desc_t for TB_FW_CONFIG
+		image_desc_t for FW_CONFIG
 	end note
-	fconf -> bl_common : load_auth_image(TB_FW_CONFIG_ID, &image_info)
+	fconf -> bl_common : load_auth_image(FW_CONFIG_ID, &image_info)
 	activate bl_common
 	note over bl_common
 		load and auth image from fip
@@ -42,7 +42,7 @@
 	fconf <- plat_bl1_common : BL2_IMAGE_DESC
 	note over fconf
 		set ep_info.args.arg0 of BL2_IMAGE_DESC
-		to TB_FW_CONFIG base address
+		to FW_CONFIG base address
 	end note
 arm_bl1_setup <- fconf
 deactivate fconf
diff --git a/docs/resources/diagrams/plantuml/fconf_bl2_populate.puml b/docs/resources/diagrams/plantuml/fconf_bl2_populate.puml
index 98a3ff1..881f253 100644
--- a/docs/resources/diagrams/plantuml/fconf_bl2_populate.puml
+++ b/docs/resources/diagrams/plantuml/fconf_bl2_populate.puml
@@ -20,12 +20,12 @@
 bl2_entrypoint -> bl2_main : bl2_setup()
 bl2_main -> arm_bl2_setup : bl2_early_platform_setup2(\n\t arg0, arg1, arg2, arg3)
 note over arm_bl2_setup
-	arg0 = tb_fw_config
+	arg0 = fw_config
 	arg1 = mem_layout
 end note
-arm_bl2_setup -> arm_bl2_setup : arm_bl2_early_platform_setup(\n\t tb_fw_config, mem_layout)
+arm_bl2_setup -> arm_bl2_setup : arm_bl2_early_platform_setup(\n\t fw_config, mem_layout)
 activate arm_bl2_setup
-	arm_bl2_setup -> fconf: fconf_polulate(tb_fw_config)
+	arm_bl2_setup -> fconf: fconf_polulate("TB_FW", fw_config)
 	activate fconf
 		fconf -> fconf_tbbr_getter: fconf_populate_tbbr_dyn_config(uintptr_t dtb)
 		note over fconf_tbbr_getter: read tbbr propeties from dtb