More cleanup of names