Added proper output file naming