Yes and no. On a spherical cow, units convert without cost. In the real world, someone ordering GW-hours of batteries is buying differently from someone buying W-hours. The prices of batteries at various scales have moved differently, with small batteries having become cheaper faster than big ones.