file rename and bug fix