(MSVC) Use Griffin from now on for MSVC PC build - make some
variable/ function names unique for Griffin