rename components to match Dc_General convention