Make directory name more appropriate