fix our references to templates