From 334d22ae1f6c857d12e3227ad0c87f9ada3f39ed Mon Sep 17 00:00:00 2001
From: Alexander Hulpke <hulpke@math.colostate.edu>
Date: Mon, 5 Dec 2016 09:00:16 -0700
Subject: [PATCH] ENHANCE: CharacteristicSubgroupsLib to
 CharacteristicSubgroups

---
 lib/autsr.gi    | 4 ++--
 lib/grp.gd      | 8 ++++----
 lib/grp.gi      | 4 ++--
 lib/grpnames.gi | 2 +-
 lib/grppclat.gi | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/autsr.gi b/lib/autsr.gi
index 67608420ea..849391b640 100644
--- a/lib/autsr.gi
+++ b/lib/autsr.gi
@@ -832,9 +832,9 @@ local d,a,map,possibly,cG,cH,nG,nH,i,j,sel,u,v,asAutomorphism,K,L,conj,e1,e2,
   # go through factors of characteristic series to keep orbits short.
   AutomorphismGroup(G:someCharacteristics:=fail);
   AutomorphismGroup(H:someCharacteristics:=fail);
-  cG:=CharacteristicSubgroupsLib(G);
+  cG:=CharacteristicSubgroups(G);
   nG:=[];
-  cH:=ShallowCopy(CharacteristicSubgroupsLib(H));
+  cH:=ShallowCopy(CharacteristicSubgroups(H));
   if Length(cG)<>Length(cH) then
     return fail;
   fi;
diff --git a/lib/grp.gd b/lib/grp.gd
index ec46db62b1..f2c3cd0c78 100644
--- a/lib/grp.gd
+++ b/lib/grp.gd
@@ -1845,11 +1845,11 @@ DeclareAttribute( "NormalSubgroups", IsGroup );
 
 #############################################################################
 ##
-#A  CharacteristicSubgroupsLib( <G> )
+#A  CharacteristicSubgroups( <G> )
 ##
-##  <#GAPDoc Label="CharacteristicSubgroupsLib">
+##  <#GAPDoc Label="CharacteristicSubgroups">
 ##  <ManSection>
-##  <Attr Name="CharacteristicSubgroupsLib" Arg='G'/>
+##  <Attr Name="CharacteristicSubgroups" Arg='G'/>
 ##
 ##  <Description>
 ##  returns a list of all characteristic subgroups of <A>G</A>, that is
@@ -1864,7 +1864,7 @@ DeclareAttribute( "NormalSubgroups", IsGroup );
 ##  </ManSection>
 ##  <#/GAPDoc>
 ##
-DeclareAttribute( "CharacteristicSubgroupsLib", IsGroup );
+DeclareAttribute( "CharacteristicSubgroups", IsGroup );
 
 
 #############################################################################
diff --git a/lib/grp.gi b/lib/grp.gi
index 990227654a..db5b08605a 100644
--- a/lib/grp.gi
+++ b/lib/grp.gi
@@ -5140,9 +5140,9 @@ end);
 
 #############################################################################
 ##
-#M  CharacteristicSubgroupsLib( <G> )
+#M  CharacteristicSubgroups( <G> )
 ##
-InstallMethod(CharacteristicSubgroupsLib,"use automorphisms",true,[IsGroup],
+InstallMethod(CharacteristicSubgroups,"use automorphisms",true,[IsGroup],
   G->Filtered(NormalSubgroups(G),x->IsCharacteristicSubgroup(G,x)));
 
 InstallTrueMethod( CanComputeSize, HasSize );
diff --git a/lib/grpnames.gi b/lib/grpnames.gi
index 36b804c4da..c226fc568f 100644
--- a/lib/grpnames.gi
+++ b/lib/grpnames.gi
@@ -464,7 +464,7 @@ InstallMethod(CharacteristicFactorsOfGroup, "generic method", true,
 function(G)
 local Ns,MinNs,sel,a,sz,j,gs,g,N;
 
-  Ns := ShallowCopy(CharacteristicSubgroupsLib(G));
+  Ns := ShallowCopy(CharacteristicSubgroups(G));
   SortBy(Ns,Size);
   MinNs:=[];
   sel:=[2..Length(Ns)-1];
diff --git a/lib/grppclat.gi b/lib/grppclat.gi
index 41b34abffc..0dbb4d27e0 100644
--- a/lib/grppclat.gi
+++ b/lib/grppclat.gi
@@ -1195,9 +1195,9 @@ end);
 
 #############################################################################
 ##
-#M  CharacteristicSubgroupsLib( <G> )
+#M  CharacteristicSubgroups( <G> )
 ##
-InstallMethod(CharacteristicSubgroupsLib,"solvable, automorphisms",true,
+InstallMethod(CharacteristicSubgroups,"solvable, automorphisms",true,
   [IsGroup and IsSolvableGroup],0,
 function(G)
 local A,s;