This patch normalizes more bitmap function names.