Use new naming convention in examples