Change to more unique dir names