Revert "Added proper output file naming"

This reverts commit be2905164c8fc21d9e5fc079b21a60fae22d4eec.
Revert "Revert "Added proper output file naming""

This reverts commit 9c9e571f9db02501a24aff7b154c994e761621c1.
Revert "Revert "Revert "Added proper output file naming"""

This reverts commit 633da87aed1a96c24a7d1e1bcdfe84b8e2f2db51.
Revert "Revert "Revert "Revert "Added proper output file naming""""

This reverts commit 3c726cce483a9a74481178843c9ffed8fa11c8d6.