diff --git a/userspace/host_tools/gen_kconfig_port_timing.sh b/userspace/host_tools/gen_kconfig_port_timing.sh
index ac38b1c6543bfe0f627514a557ee54361c2a4ddf..17e99c23540ef157e97a4bb45031ef800ca90168 100755
--- a/userspace/host_tools/gen_kconfig_port_timing.sh
+++ b/userspace/host_tools/gen_kconfig_port_timing.sh
@@ -281,27 +281,27 @@ function print_instance_header() {
 		echo -e "	  The value is the logarithm to the base 2." >>$OUTPUT_FILE
 		echo -e "	  The configurable range shall be 2 to 10" >>$OUTPUT_FILE
 		
-		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_TX_COHERENCY_IS_REQUIRED" >>$OUTPUT_FILE
+		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_TX_COHERENT_IS_REQUIRED" >>$OUTPUT_FILE
 		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM && PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\"" >>$OUTPUT_FILE
-		echo -e "	bool \"L1SyncBasicPortDS.txCoherencyIsRequired\"" >>$OUTPUT_FILE
+		echo -e "	bool \"L1SyncBasicPortDS.txCoherentIsRequired\"" >>$OUTPUT_FILE
 		echo -e "	default y" >>$OUTPUT_FILE
 		echo -e "	help" >>$OUTPUT_FILE
 		echo -e "	   The Boolean attribute txCoherentIsRequired specifies the configuration of the L1Sync port and the" >>$OUTPUT_FILE
 		echo -e "	   expected configuration of its peer L1Sync port. This configuration indicates whether the L1Sync port is" >>$OUTPUT_FILE
 		echo -e "	   required to be a transmit coherent port." >>$OUTPUT_FILE
 	
-		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_RX_COHERENCY_IS_REQUIRED" >>$OUTPUT_FILE
+		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_RX_COHERENT_IS_REQUIRED" >>$OUTPUT_FILE
 		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM && PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\"" >>$OUTPUT_FILE
-		echo -e "	bool \"L1SyncBasicPortDS.rxCoherencyIsRequired\"" >>$OUTPUT_FILE
+		echo -e "	bool \"L1SyncBasicPortDS.rxCoherentIsRequired\"" >>$OUTPUT_FILE
 		echo -e "	default y" >>$OUTPUT_FILE
 		echo -e "	help" >>$OUTPUT_FILE
 		echo -e "	  The Boolean attribute rxCoherentIsRequired specifies the configuration of the L1Sync port and the" >>$OUTPUT_FILE
 		echo -e "	  expected configuration of its peer L1Sync port. This configuration indicates whether the L1Sync port is" >>$OUTPUT_FILE
 		echo -e "	  required to be a receive coherent port." >>$OUTPUT_FILE
 	
-		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_CONGRUENCY_IS_REQUIRED" >>$OUTPUT_FILE
+		echo -e "\nconfig PORT${portStr}_INST${instStr}_L1SYNC_CONGRUENT_IS_REQUIRED" >>$OUTPUT_FILE
 		echo -e "	depends on PORT${portStr}_INST${instStr}_PROFILE_CUSTOM && PORT${portStr}_INST${instStr}_L1SYNC_ENABLED=\"y\"" >>$OUTPUT_FILE
-		echo -e "	bool \"L1SyncBasicPortDS.congruencyIsRequired\"" >>$OUTPUT_FILE
+		echo -e "	bool \"L1SyncBasicPortDS.congruentIsRequired\"" >>$OUTPUT_FILE
 		echo -e "	default y" >>$OUTPUT_FILE
 		echo -e "	help" >>$OUTPUT_FILE
 		echo -e "	  The Boolean attribute congruentIsRequired specifies configuration of the L1Sync port and the expected" >>$OUTPUT_FILE
diff --git a/userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh b/userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
index 56f9b9d509ff2f26ccb29cfcc2025c25963a4bb3..389071c97f3ef1e0f3aa15a88feead3b424ea1f6 100755
--- a/userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
+++ b/userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
@@ -247,8 +247,8 @@ function disable_L1sync() {
 	local inst=$1
 	local lv
 	
- 	for k in l1SyncEnabled l1SyncTxCoherencyIsRequired  l1SyncRxCoherencyIsRequired \
- 	         l1SyncCongruencyIsRequired logL1SyncInterval l1SyncReceiptTimeout l1SyncOptParamsEnabled; do 
+	for k in l1SyncEnabled l1SyncTxCoherentIsRequired  l1SyncRxCoherentIsRequired \
+	         l1SyncCongruentIsRequired logL1SyncInterval l1SyncReceiptTimeout l1SyncOptParamsEnabled; do
  		lv="$inst[$k]"; unset ${lv}
  	done
 }
@@ -272,7 +272,7 @@ function set_profile_for_HA() {
 	local inst=$1
 	local lv
 	# L1SYNC mandatory values
- 	for k in l1SyncEnabled l1SyncTxCoherencyIsRequired  l1SyncRxCoherencyIsRequired l1SyncCongruencyIsRequired ; do 
+	for k in l1SyncEnabled l1SyncTxCoherentIsRequired  l1SyncRxCoherentIsRequired l1SyncCongruentIsRequired ; do
  		lv="$inst[$k]"; eval ${lv}="y"
  	done
  	lv="$inst[l1SyncOptParamsEnabled]"; eval ${lv}="n"
@@ -359,8 +359,9 @@ declare -A inst_dotc_ppsi_key_mapping='(\
 [L1SYNC_ENABLED]="l1SyncEnabled" [L1SYNC_INTERVAL]="logL1SyncInterval" \
 [L1SYNC_RECEIPT_TIMEOUT]="l1SyncReceiptTimeout" \
 [L1SYNC_OPT_PARAMS_ENABLED]="l1SyncOptParamsEnabled" [L1SYNC_OPT_PARAMS_TS_CORRECTED_TX_ENABLED]="l1SyncTimestampsCorrectedTxEnabled" \
-[L1SYNC_TX_COHERENCY_IS_REQUIRED]="l1SyncTxCoherencyIsRequired" \
-[L1SYNC_RX_COHERENCY_IS_REQUIRED]="l1SyncRxCoherencyIsRequired" [L1SYNC_CONGRUENCY_IS_REQUIRED]="l1SyncCongruencyIsRequired" \
+[L1SYNC_TX_COHERENT_IS_REQUIRED]="l1SyncTxCoherentIsRequired" \
+[L1SYNC_RX_COHERENT_IS_REQUIRED]="l1SyncRxCoherentIsRequired" \
+[L1SYNC_CONGRUENT_IS_REQUIRED]="l1SyncCongruentIsRequired" \
 [_VLAN]="vlan" \
 )'