Updated a number of examples to new naming convention