fixing name issues