Issue #119: making 32-bit names consistent