minor name changes to fix JSHint issues