templates use new naming system.