Remove files, they start with CDF and we simplify to just add component
name.