Fix display custom name, and clean up.