updates to fn_group for better name matching, refs #7797