DDF-596: Made examples, code more consistent