New project solution
Changed names