Made a few minor name changes.