Update safeName

Update safeName