organize Task file names better