Rename and remove obsoletes