Updated solution
Unborked the GenerateFileName method.