Conform to new paths.