Align Neon terminology and mirror Neon's reference (#1563)