fixup: unify bitmap arrays naming