Fixed rename bug & format