Apple treats these as two distinct systems that include an extra code to protect your account. But even people who have enabled either two-step or two-factor are hard pressed to understand which is ...