Fix a small error and incorrect file naming in one scenario