Added character replacement for name