Changed Solution and Project names

to better match