rename and fix syntax