Be consistent with references in templates