fixed some name issues