fixing additional name issues