rename and little changes