fixed ap-map potential naming conflict