diff --git a/src/environments/groupthm.pysty3 b/src/environments/groupthm.pysty3
index 71bd0cd..79db9a1 100644
--- a/src/environments/groupthm.pysty3
+++ b/src/environments/groupthm.pysty3
@@ -76,8 +76,8 @@ __HEADER__(Grouping theorems for easier customization.)
     mapname      .groups:n      = { theoremgroup },
     thmtools     .clist_set:N   = \l_groupthm_thmtools_clist,
     thmtools     .default:n     = {},
-    thmtools     .groups:n      = { theoremgroup, groupedtheorem, theoremvariants }%,
-%    unknown      .code:n        = \msg_error:nnn { groupthm } { unknown ~ group } { \l_keys_key_str }
+    thmtools     .groups:n      = { theoremgroup, groupedtheorem, theoremvariants },
+    unknown      .code:n        = \msg_error:nnn { groupthm } { unknown ~ group } { \l_keys_key_str }
   }
 
 
@@ -136,6 +136,14 @@ __HEADER__(Grouping theorems for easier customization.)
   }
 }
 
+\cs_new:Npn \map_use_on_name:n #1
+{
+  \tl_set:Nx \l_groupthm_name_tl
+  {
+    #1 { \tl_use:N \l_groupthm_name_tl }
+  }
+}
+
 % envname, groups, name, thmtools
 \cs_new:Npn \new_grouped_theorem:nnnn #1 #2 #3 #4
 {
@@ -152,14 +160,13 @@ __HEADER__(Grouping theorems for easier customization.)
   \RemoveFromHook { groupthm / thmtools }[*]
   
   \clist_map_function:nN { #2 } \group_use:n
-
-
   \hook_use:n { groupthm / prename }
   \hook_use:n { groupthm / postname }
   \hook_use:n { groupthm / mapname }
-  %% this next line fails somehow
   \hook_use:n { groupthm / thmtools }
 
+  \clist_map_function:NN \l_groupthm_mapname_clist \map_use_on_name:n
+  
   \clist_put_right:Nx \l_groupthm_thmtools_clist
   {
     name = \tl_use:N \l_groupthm_prename_tl