Make the names of result files and targets more specific.