Update cpd references to new naming/file structure