Fix filenames

Some tests still failing, but not sure of the best way of fixing them at
this point.