diff --git a/doc/environments/groupthm/groupthm.dtx b/doc/environments/groupthm/groupthm.dtx
index 5ea52c8..bd78950 100644
--- a/doc/environments/groupthm/groupthm.dtx
+++ b/doc/environments/groupthm/groupthm.dtx
@@ -854,9 +854,9 @@
 %    \begin{macrocode}
 \cs_new:Npn \@@_hook_gset_rule_foreach:nNnn #1 #2 #3 #4
   {
-    \cs_set:Npn \@@_map_aux:n
+    \cs_set:Npn \@@_map_aux:n ##1
     {
-      \hooks_gset_rule:nnnn { #1 } { ##1 } { #3 } { #4 }
+      \hook_gset_rule:nnnn { #1 } { ##1 } { #3 } { #4 }
     }
     \clist_map_function:NN #2 \@@_map_aux:n
   }
@@ -1044,8 +1044,8 @@
 %    \begin{macrocode}
 \cs_new:Npn \@@_set_normalized_keys:nnn #1 #2 #3
   {
-    \keys_set:nn { @@ } { prename, name, postname, group, mapname, thmtools }
-    \keys_set_groups:nnn { @@ } { #2 } { #1 }
+    \keys_set:nn { groupthm } { prename, name, postname, group, mapname, thmtools }
+    \keys_set_groups:nnn { groupthm } { #2 } { #1 }
 %    \end{macrocode}
 %
 % Normalize given name
@@ -1382,7 +1382,7 @@
 \cs_new:Npn \groupthm_new_theorem_group_by_keys:nn #1#2
 {
   \@@_set_normalized_keys:nnn { #1 } { theoremgroup } { #2 }
-  \groupthm_new_theorem_group:nVVVV { #1 }
+  \groupthm_new_theorem_group:nVVVV { #2 }
     \l_@@_prename_tl
     \l_@@_postname_tl
     \l_@@_mapname_clist
@@ -1402,7 +1402,7 @@
 \cs_new:Npn \groupthm_renew_theorem_group_by_keys:nn #1#2
 {
   \@@_set_normalized_keys:nnn { #1 } { theoremgroup } { #2 }
-  \groupthm_renew_theorem_group:nVVVV { #1 }
+  \groupthm_renew_theorem_group:nVVVV { #2 }
     \l_@@_prename_tl
     \l_@@_postname_tl
     \l_@@_mapname_clist
@@ -1422,7 +1422,7 @@
 \cs_new:Npn \groupthm_provide_theorem_group_by_keys:nn #1#2
 {
   \@@_set_normalized_keys:nnn { #1 } { theoremgroup } { #2 }
-  \groupthm_provide_theorem_group:nVVVV { #1 }
+  \groupthm_provide_theorem_group:nVVVV { #2 }
     \l_@@_prename_tl
     \l_@@_postname_tl
     \l_@@_mapname_clist
@@ -1442,7 +1442,7 @@
 \cs_new:Npn \groupthm_declare_theorem_group_by_keys:nn #1#2
 {
   \@@_set_normalized_keys:nnn { #1 } { theoremgroup } { #2 }
-  \groupthm_declare_theorem_group:nVVVV { #1 }
+  \groupthm_declare_theorem_group:nVVVV { #2 }
     \l_@@_prename_tl
     \l_@@_postname_tl
     \l_@@_mapname_clist
diff --git a/doc/environments/groupthm/groupthm.sty b/doc/environments/groupthm/groupthm.sty
index fcd7826..586b1b9 100644
--- a/doc/environments/groupthm/groupthm.sty
+++ b/doc/environments/groupthm/groupthm.sty
@@ -32,9 +32,9 @@
 \cs_generate_variant:Nn \__groupthm_declare_theorem_group:nn { n V }
 \cs_new:Npn \__groupthm_hook_gset_rule_foreach:nNnn #1 #2 #3 #4
   {
-    \cs_set:Npn \__groupthm_map_aux:n
+    \cs_set:Npn \__groupthm_map_aux:n ##1
     {
-      \hooks_gset_rule:nnnn { #1 } { ##1 } { #3 } { #4 }
+      \hook_gset_rule:nnnn { #1 } { ##1 } { #3 } { #4 }
     }
     \clist_map_function:NN #2 \__groupthm_map_aux:n
   }
@@ -95,8 +95,8 @@
   }
 \cs_new:Npn \__groupthm_set_normalized_keys:nnn #1 #2 #3
   {
-    \keys_set:nn { __groupthm } { prename, name, postname, group, mapname, thmtools }
-    \keys_set_groups:nnn { __groupthm } { #2 } { #1 }
+    \keys_set:nn { groupthm } { prename, name, postname, group, mapname, thmtools }
+    \keys_set_groups:nnn { groupthm } { #2 } { #1 }
     \tl_if_eq:NnTF \l__groupthm_key_name_tl { \c_novalue_tl }
       {
         \tl_set:Nx \l__groupthm_name_tl
@@ -200,7 +200,7 @@
       }
   }
 \cs_generate_variant:Nn \groupthm_new_theorem_group:nnnnn { n V V V V }
-\cs_new:Npn \groupthm_renew_theorem_group:nnnnn #1 #2 #3 #3 #5
+\cs_new:Npn \groupthm_renew_theorem_group:nnnnn #1 #2 #3 #4 #5
   {
     \cs_if_exist:cTF { __groupthm_use_group_#1 }
       {
@@ -213,7 +213,7 @@
       }
   }
 \cs_generate_variant:Nn \groupthm_renew_theorem_group:nnnnn { n V V V V }
-\cs_new:Npn \groupthm_provide_theorem_group:nnnnn #1 #2 #3 #3 #5
+\cs_new:Npn \groupthm_provide_theorem_group:nnnnn #1 #2 #3 #4 #5
   {
     \cs_if_exist:cF { __groupthm_use_group_#1 }
       {
@@ -221,7 +221,7 @@
       }
   }
 \cs_generate_variant:Nn \groupthm_provide_theorem_group:nnnnn { n V V V V }
-\cs_new:Npn \groupthm_declare_theorem_group:nnnnn #1 #2 #3 #3 #5
+\cs_new:Npn \groupthm_declare_theorem_group:nnnnn #1 #2 #3 #4 #5
   {
     \cs_if_exist:cT { __groupthm_use_group_#1 }
       {
@@ -233,7 +233,7 @@
 \cs_new:Npn \groupthm_new_theorem_group_by_keys:nn #1#2
 {
   \__groupthm_set_normalized_keys:nnn { #1 } { theoremgroup } { #2 }
-  \groupthm_new_theorem_group:nVVVV { #1 }
+  \groupthm_new_theorem_group:nVVVV { #2 }
     \l__groupthm_prename_tl
     \l__groupthm_postname_tl
     \l__groupthm_mapname_clist
@@ -242,7 +242,7 @@
 \cs_new:Npn \groupthm_renew_theorem_group_by_keys:nn #1#2
 {
   \__groupthm_set_normalized_keys:nnn { #1 } { theoremgroup } { #2 }
-  \groupthm_renew_theorem_group:nVVVV { #1 }
+  \groupthm_renew_theorem_group:nVVVV { #2 }
     \l__groupthm_prename_tl
     \l__groupthm_postname_tl
     \l__groupthm_mapname_clist
@@ -251,7 +251,7 @@
 \cs_new:Npn \groupthm_provide_theorem_group_by_keys:nn #1#2
 {
   \__groupthm_set_normalized_keys:nnn { #1 } { theoremgroup } { #2 }
-  \groupthm_provide_theorem_group:nVVVV { #1 }
+  \groupthm_provide_theorem_group:nVVVV { #2 }
     \l__groupthm_prename_tl
     \l__groupthm_postname_tl
     \l__groupthm_mapname_clist
@@ -260,7 +260,7 @@
 \cs_new:Npn \groupthm_declare_theorem_group_by_keys:nn #1#2
 {
   \__groupthm_set_normalized_keys:nnn { #1 } { theoremgroup } { #2 }
-  \groupthm_declare_theorem_group:nVVVV { #1 }
+  \groupthm_declare_theorem_group:nVVVV { #2 }
     \l__groupthm_prename_tl
     \l__groupthm_postname_tl
     \l__groupthm_mapname_clist