Fixes for MSVC and some naming changes.