Fixed rename and save
Fixed rename bug