Post-merger fixup of electricity classes