Adapt name always escaped change to other specs