Fix wrong high bit names after changing bit set while less than 32 bits