diff --git a/raddb/mods-available/sql b/raddb/mods-available/sql
index 719a53010849..45eb97db2302 100644
--- a/raddb/mods-available/sql
+++ b/raddb/mods-available/sql
@@ -195,7 +195,7 @@ sql {
 	client_table = "nas"
 
 	# The group attribute specific to this instance of rlm_sql
-	group_attr = "${.:instance}-${.:name}-Group"
+	group_attribute = "${.:instance}-${.:name}-Group"
 
 	# Read database-specific queries
 	#
diff --git a/raddb/mods-config/sql/main/cassandra/queries.conf b/raddb/mods-config/sql/main/cassandra/queries.conf
index 9e886d394972..eaf49ce74fd6 100644
--- a/raddb/mods-config/sql/main/cassandra/queries.conf
+++ b/raddb/mods-config/sql/main/cassandra/queries.conf
@@ -117,13 +117,13 @@ authorize_group_check_query = "\
 	SELECT id, groupname, attribute, \
 	Value, op \
 	FROM ${groupcheck_table} \
-	WHERE groupname = '%{${group_attr}}'"
+	WHERE groupname = '%{${group_attribute}}'"
 
 authorize_group_reply_query = "\
 	SELECT id, groupname, attribute, \
 	value, op \
 	FROM ${groupreply_table} \
-	WHERE groupname = '%{${group_attr}}'"
+	WHERE groupname = '%{${group_attribute}}'"
 
 #######################################################################
 # Simultaneous Use Checking Queries
diff --git a/raddb/mods-config/sql/main/mysql/queries.conf b/raddb/mods-config/sql/main/mysql/queries.conf
index ecd2f329f9c3..f008d957d839 100644
--- a/raddb/mods-config/sql/main/mysql/queries.conf
+++ b/raddb/mods-config/sql/main/mysql/queries.conf
@@ -141,14 +141,14 @@ authorize_group_check_query = "\
 	SELECT id, groupname, attribute, \
 	Value, op \
 	FROM ${groupcheck_table} \
-	WHERE groupname = '%{${group_attr}}' \
+	WHERE groupname = '%{${group_attribute}}' \
 	ORDER BY id"
 
 authorize_group_reply_query = "\
 	SELECT id, groupname, attribute, \
 	value, op \
 	FROM ${groupreply_table} \
-	WHERE groupname = '%{${group_attr}}' \
+	WHERE groupname = '%{${group_attribute}}' \
 	ORDER BY id"
 
 #######################################################################
diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index 429814f492e2..962f4f00b66f 100644
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -146,13 +146,13 @@ authorize_reply_query = "\
 authorize_group_check_query = "\
 	SELECT id, GroupName, Attribute, Value, op \
 	FROM ${groupcheck_table} \
-	WHERE GroupName = '%{${group_attr}}' \
+	WHERE GroupName = '%{${group_attribute}}' \
 	ORDER BY id"
 
 authorize_group_reply_query = "\
 	SELECT id, GroupName, Attribute, Value, op \
 	FROM ${groupreply_table} \
-	WHERE GroupName = '%{${group_attr}}' \
+	WHERE GroupName = '%{${group_attribute}}' \
 	ORDER BY id"
 
 #######################################################################
diff --git a/raddb/mods-config/sql/main/sqlite/queries.conf b/raddb/mods-config/sql/main/sqlite/queries.conf
index 86c1380ef664..8717fe641789 100644
--- a/raddb/mods-config/sql/main/sqlite/queries.conf
+++ b/raddb/mods-config/sql/main/sqlite/queries.conf
@@ -131,14 +131,14 @@ authorize_group_check_query = "\
 	SELECT id, groupname, attribute, \
 	Value, op \
 	FROM ${groupcheck_table} \
-	WHERE groupname = '%{${group_attr}}' \
+	WHERE groupname = '%{${group_attribute}}' \
 	ORDER BY id"
 
 authorize_group_reply_query = "\
 	SELECT id, groupname, attribute, \
 	value, op \
 	FROM ${groupreply_table} \
-	WHERE groupname = '%{${group_attr}}' \
+	WHERE groupname = '%{${group_attribute}}' \
 	ORDER BY id"
 
 #######################################################################
@@ -166,7 +166,7 @@ simul_verify_query = "\
 	SELECT radacctid, acctsessionid, username, nasipaddress, nasportid, framedipaddress, \
 		callingstationid, framedprotocol \
 	FROM ${acct_table1} \
-	WHERE username = '%{${group_attr}}' \
+	WHERE username = '%{${group_attribute}}' \
 	AND acctstoptime IS NULL"
 
 #######################################################################
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 05883a0fd2ca..90b09747f5be 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -92,7 +92,7 @@ static const CONF_PARSER module_config[] = {
 	{ "read_clients", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, rlm_sql_config_t, do_clients), "no" },
 	{ "delete_stale_sessions", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, rlm_sql_config_t, delete_stale_sessions), "yes" },
 	{ "sql_user_name", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_XLAT, rlm_sql_config_t, query_user), "" },
-	{ "group_attr", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_XLAT, rlm_sql_config_t, group_attr), NULL },
+	{ "group_attribute", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_sql_config_t, group_attribute), NULL },
 	{ "logfile", FR_CONF_OFFSET(PW_TYPE_STRING | PW_TYPE_XLAT, rlm_sql_config_t, logfile), NULL },
 	{ "default_user_profile", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_sql_config_t, default_profile), "" },
 	{ "client_query", FR_CONF_OFFSET(PW_TYPE_STRING, rlm_sql_config_t, client_query), "SELECT id,nasname,shortname,type,secret FROM nas" },
@@ -1022,26 +1022,26 @@ static int mod_bootstrap(CONF_SECTION *conf, void *instance)
 	if (inst->config->groupmemb_query) {
 		char buffer[256];
 
-		char const *group_attr;
+		char const *group_attribute;
 
-		if (inst->config->group_attr) {
-			group_attr = inst->config->group_attr;
+		if (inst->config->group_attribute) {
+			group_attribute = inst->config->group_attribute;
 		} else if (cf_section_name2(conf)) {
 			snprintf(buffer, sizeof(buffer), "%s-SQL-Group", inst->name);
-			group_attr = buffer;
+			group_attribute = buffer;
 		} else {
-			group_attr = "SQL-Group";
+			group_attribute = "SQL-Group";
 		}
 
 		/*
 		 *	Checks if attribute already exists.
 		 */
-		if (paircompare_register_byname(group_attr, dict_attrbyvalue(PW_USER_NAME, 0),
+		if (paircompare_register_byname(group_attribute, dict_attrbyvalue(PW_USER_NAME, 0),
 						false, sql_groupcmp, inst) < 0) {
 			ERROR("Error registering group comparison: %s", fr_strerror());
 			return -1;
 		}
-		inst->group_da = dict_attrbyname(group_attr);
+		inst->group_da = dict_attrbyname(group_attribute);
 	}
 
 	/*
diff --git a/src/tests/modules/sql_mysql/module.conf b/src/tests/modules/sql_mysql/module.conf
index 6511d9d6cd73..e3aa02ddea80 100644
--- a/src/tests/modules/sql_mysql/module.conf
+++ b/src/tests/modules/sql_mysql/module.conf
@@ -46,7 +46,7 @@ sql {
 	client_table = "nas"
 
 	# The group attribute specific to this instance of rlm_sql
-	group_attr = "SQL-Group"
+	group_attribute = "SQL-Group"
 
 	# Read database-specific queries
 	$INCLUDE ${modconfdir}/${.:name}/main/${dialect}/queries.conf
diff --git a/src/tests/modules/sql_postgresql/module.conf b/src/tests/modules/sql_postgresql/module.conf
index 0b28c11fa6d4..ee9a8a9367b9 100644
--- a/src/tests/modules/sql_postgresql/module.conf
+++ b/src/tests/modules/sql_postgresql/module.conf
@@ -45,7 +45,7 @@ sql {
 	client_table = "nas"
 
 	# The group attribute specific to this instance of rlm_sql
-	group_attr = "SQL-Group"
+	group_attribute = "SQL-Group"
 
 	# Read database-specific queries
 	$INCLUDE ${modconfdir}/${.:name}/main/${dialect}/queries.conf
diff --git a/src/tests/modules/sql_sqlite/module.conf b/src/tests/modules/sql_sqlite/module.conf
index bc5f277eb7a7..1d8ac74e99fb 100644
--- a/src/tests/modules/sql_sqlite/module.conf
+++ b/src/tests/modules/sql_sqlite/module.conf
@@ -45,7 +45,7 @@ sql {
 	client_table = "nas"
 
 	# The group attribute specific to this instance of rlm_sql
-	group_attr = "SQL-Group"
+	group_attribute = "SQL-Group"
 
 	# Read database-specific queries
 	$INCLUDE ${modconfdir}/${.:name}/main/${dialect}/queries.conf