Quick cleanup for name