- Fix naming issue
- Add checking for visual studio 2010 and 2012