Names fixed, and cleanup.