Made output filename generic