Fix path names for flattened hierarchy.