Flow name/id is lost after conversion

@jurgenhaas, the fix was surprisingly easy! Can you do QA?

Thank you @lammensj, this looks great. I was kind of assuming it would be something like this, I just wasn't sure where to look myself. It's much appreciated that you can help so quickly on stuff like this.

Merged and back ported.