Improve the rename and illegale char