Component name changes suggested by @dfisher.