bad naming of bitwise_andnot/bitwise_ornot optimization files, related to #538