Revert "rename APN to APN2"

This reverts commit 4da7c1e9dc37227dfa4ce359f708f6ac2909cbcd.