Clean up Japanese APNs

* Rename and rearrange Japanese APNs to make intelligible.