Merge "Use correct variables for the directories in CleanSpec"