Move _ replacement code on plot names