Some tentative name changes.