change pointtopoint to pointopoint also in template (contributes to #18331 )