ipdated templates to use related_name values in result models