Made some minor name changes.