Fixed name normalization (hopefully)