Clean up directory naming.