Gave the function groups prettier names.  (touched a lot of files therefore)