diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 3e78a75..afb24c3 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -103,7 +103,7 @@ typedef struct SubOpts
 	bool		include_generated_column;
 } SubOpts;
 
-static List *fetch_table_list(WalReceiverConn *wrconn, List *publications, bool include_generated_column);
+static List *fetch_table_list(WalReceiverConn *wrconn, List *publications, bool include_generated_columns);
 static void check_publications_origin(WalReceiverConn *wrconn,
 									  List *publications, bool copydata,
 									  char *origin, Oid *subrel_local_oids,
@@ -2147,7 +2147,7 @@ check_publications_origin(WalReceiverConn *wrconn, List *publications,
  * list and row filter are specified for different publications.
  */
 static List *
-fetch_table_list(WalReceiverConn *wrconn, List *publications, bool include_generated_column)
+fetch_table_list(WalReceiverConn *wrconn, List *publications, bool include_generated_columns)
 {
 	WalRcvExecResult *res;
 	StringInfoData cmd;
@@ -2156,7 +2156,7 @@ fetch_table_list(WalReceiverConn *wrconn, List *publications, bool include_gener
 	List	   *tablelist = NIL;
 	int			server_version = walrcv_server_version(wrconn);
 	bool		check_columnlist = (server_version >= 150000);
-	bool		check_gen_col = (server_version >= 170000);
+	bool		check_gen_cols = (server_version >= 170000);
 	int 		column_count;
 
 	initStringInfo(&cmd);
@@ -2186,13 +2186,13 @@ fetch_table_list(WalReceiverConn *wrconn, List *publications, bool include_gener
 		appendStringInfo(&cmd, "SELECT DISTINCT n.nspname, c.relname, gpt.attrs\n");
 
 		/*
-		 * Get the count of generated columns in the table in the the publication.
+		 * Get the count of generated columns in the table in the publication.
 		 */
-		if(!include_generated_column && check_gen_col)
+		if (!include_generated_columns && check_gen_cols)
 		{
 			tableRow[3] = INT8OID;
-			appendStringInfo(&cmd, ", (SELECT COUNT(*) FROM pg_attribute a where a.attrelid = c.oid\n"
-								   " and a.attnum = ANY(gpt.attrs) and a.attgenerated = 's') gen_col_count\n");
+			appendStringInfo(&cmd, ", (SELECT COUNT(*) FROM pg_attribute a WHERE a.attrelid = c.oid\n"
+								   " AND a.attnum = ANY(gpt.attrs) AND a.attgenerated = 's') gen_col_count\n");
 		}
 
 		appendStringInfo(&cmd, "  FROM pg_class c\n"
@@ -2220,7 +2220,7 @@ fetch_table_list(WalReceiverConn *wrconn, List *publications, bool include_gener
 		appendStringInfoChar(&cmd, ')');
 	}
 
-	column_count = (!include_generated_column && check_gen_col) ? 4 : (check_columnlist ? 3 : 2);
+	column_count = (!include_generated_columns && check_gen_cols) ? 4 : (check_columnlist ? 3 : 2);
 	res = walrcv_exec(wrconn, cmd.data, column_count, tableRow);
 	pfree(cmd.data);
 
@@ -2255,7 +2255,7 @@ fetch_table_list(WalReceiverConn *wrconn, List *publications, bool include_gener
 		 * If include_generated_column option is false and all the column of the table in the
 		 * publication are generated then we should throw an error.
 		 */
-		if (!isnull && !include_generated_column && check_gen_col)
+		if (!isnull && !include_generated_columns && check_gen_cols)
 		{
 			attlist = DatumGetArrayTypeP(attlistdatum);
 			gen_col_count = DatumGetInt32(slot_getattr(slot, 4, &isnull));