updated function names (tpl -> rapport)