Updated replace strings