[RFC] Removed flow prefix