Rename and fix deps.