cleanup of wifi firmware names

Change-Id: I6fdae06980e463bf5e99ca535e9c5eb819437074