More cleanup of names.