Make component disk layout/naming more consistent.