Rename and improvements related to close
p4#: 20645