Fixed rename and create default name bug