Add names to groups and improve readability of log