change struct member naming style and fix bitset bug