Replace deprecated syntax