Still need to verify to make sure no unwanted renaming is introduced.
Made all buildsystems to work again (jam, msvc, cmake)