fixed typename problems on vs