Fix up model names and file names