Fix initial names not being handled properly