Minor name changes for new coding standards.