(MSVC) More renaming