further tpl->rapport fn prefix updates
fix installation of outdated HH