[splash] better grouping and names