Normalized, ungrouped, and sorted names

Signed-off-by: Todd Crane <todd@toddcrane.com>