Merge "Bump missing template names to ocata"