Correct some namings