Fix name
Change task names to be grouped when sorting alphabetically and more unique