Rename an AppData file to reflect reality
Remove upstreamed AppData files