H4 EAD - renewal with name fix

Hi, my spouse’s first H4 EAD card was based on first name blank in passport had Given name as - ‘’No name given’’. We were able to get my passport/I797 H4/I94 fixed with proper first name and last name. We have returned from SSN as they need EAD name corrected before replacing SSN card. How to get H4 EAD corrected? Can I get it replaced before renewal or should I apply for both renewal and name update together ? Please suggest.