Fixed more name errors.