Rename and import fix