fix name issues