More fixes on syntax name passing