Similar rename and doc update here.