Correct minor name changes