Name changes, vs2012 fix