fixed name issues