Rename and correction import