Update samples and text to latest syntax