remove ap naming