Fix demos using old syntax and syntax definition