Fix up filename and year