More cleanup of the name property