rename and a bit update