Correct name references