Uniform solution names
Drop the C2D from the prefix