Fixed some name issues