Correct some name issues