rename
x86 build fixes