rename and include