Update example code to use the latest conventions.