Copy DCP name layout fix from master.