Generic impacts / flows, continuation

Renamings.