rename and fixed tab issue