Renamed definitions: explicitely include 64bit in the name (to prepare for 32bit support)