last functions rename and fix