rename and fixes