use Forwardable in RenamedDelegate instead of manual definition
Replace all occurences in RenamedDelegate