Fix names and paths.