Rename and remove legacy deps