Clean up names and directories.