fixed name errors