rename and add missing packages