diff --git a/src/include/utils/sync_guc_name.h b/src/include/utils/sync_guc_name.h
index 69fbbc4ee945e72d9c8a2e13badd3f7f54be6d9a..1bfc4e14681acfb2466c5ce0e9c313ee5de24c65 100644
--- a/src/include/utils/sync_guc_name.h
+++ b/src/include/utils/sync_guc_name.h
@@ -108,10 +108,10 @@
 		"statement_mem",
 		"statement_timeout",
 		"temp_buffers",
+		"temp_tablespaces",
 		"test_copy_qd_qe_split",
 		"test_print_prefetch_joinqual",
 		"TimeZone",
 		"verify_gpfdists_cert",
 		"vmem_process_interrupt",
 		"work_mem",
-		"temp_tablespaces",
diff --git a/src/include/utils/unsync_guc_name.h b/src/include/utils/unsync_guc_name.h
index 06eb560f5f9650fcdb0a3eb9a55abf28d114ebb7..205e4c993bfc29f1c1a091368820c1e1d0d850cd 100644
--- a/src/include/utils/unsync_guc_name.h
+++ b/src/include/utils/unsync_guc_name.h
@@ -75,6 +75,7 @@
 		"debug_datumstream_write_print_large_varlena_info",
 		"debug_datumstream_write_print_small_varlena_info",
 		"debug_datumstream_write_use_small_initial_buffers",
+		"debug_deadlocks",
 		"debug_disable_distributed_snapshot",
 		"debug_dtm_action",
 		"debug_dtm_action_nestinglevel",
@@ -272,9 +273,9 @@
 		"lc_monetary",
 		"lc_time",
 		"listen_addresses",
-		"lo_compat_privileges",
 		"local_preload_libraries",
 		"lock_timeout",
+		"lo_compat_privileges",
 		"log_autostats",
 		"log_autovacuum_min_duration",
 		"log_checkpoints",
@@ -284,6 +285,7 @@
 		"log_disconnections",
 		"log_file_mode",
 		"log_filename",
+		"logging_collector",
 		"log_hostname",
 		"log_line_prefix",
 		"log_lock_waits",
@@ -296,7 +298,6 @@
 		"log_temp_files",
 		"log_timezone",
 		"log_truncate_on_rotation",
-		"logging_collector",
 		"maintenance_mode",
 		"max_appendonly_tables",
 		"max_connections",
@@ -307,8 +308,6 @@
 		"max_locks_per_transaction",
 		"max_pred_locks_per_transaction",
 		"max_prepared_transactions",
-		"trace_lock_oidmin",
-		"trace_lock_table",
 		"max_replication_slots",
 		"max_resource_portals_per_transaction",
 		"max_resource_queues",
@@ -431,7 +430,6 @@
 		"quote_all_identifiers",
 		"random_page_cost",
 		"readable_external_table_timeout",
-		"write_to_gpfdist_timeout",
 		"repl_catchup_within_range",
 		"resource_cleanup_gangs_on_wait",
 		"resource_scheduler",
@@ -459,6 +457,7 @@
 		"ssl_ecdh_curve",
 		"ssl_key_file",
 		"ssl_prefer_server_ciphers",
+		"ssl_renegotiation_limit",
 		"standard_conforming_strings",
 		"stats_queue_level",
 		"stats_temp_directory",
@@ -477,13 +476,14 @@
 		"test_AppendOnlyHash_eviction_vs_just_marking_not_inuse",
 		"test_print_direct_dispatch_info",
 		"timezone_abbreviations",
-		"trace_notify",
+		"trace_lock_oidmin",
 		"trace_locks",
-		"trace_userlocks",
+		"trace_lock_table",
 		"trace_lwlocks",
-		"debug_deadlocks",
+		"trace_notify",
 		"trace_recovery_messages",
 		"trace_sort",
+		"trace_userlocks",
 		"track_activities",
 		"track_activity_query_size",
 		"track_commit_timestamp",
@@ -524,9 +524,9 @@
 		"wal_writer_delay",
 		"wal_writer_flush_after",
 		"writable_external_table_bufsize",
+		"write_to_gpfdist_timeout",
 		"xid_stop_limit",
 		"xid_warn_limit",
 		"xmlbinary",
 		"xmloption",
 		"zero_damaged_pages",
-		"ssl_renegotiation_limit",