Fixed grammar expand node name and contentName