Added new naming to other templates