rename and remove dep