rename and move functions
rename and move