Minor renaming.
Rearranging visual studio filters, updating year.