Fix output name management.
Merge pull request #4040 from HassenRiahi/FixOutputNameMamangement

Fix output name management.