Change Names of Page Types / Update Templates

This should be the final list of page part types