Fix up filenames

Left overs from the Great Refactoring