DDF-596: Fixed examples, code to be more consistent