Update kernel templates to match kernels