Fixed name/group pattern
Added clansi support