rename and modify the way to import