We, in Silicon Valley, used "floppies" to mean "5.25 or 3.5 inch disks." (Confusing, yes?)
And, we used "disks" to mean "any type of storage media, fixed or removable."
Also, "diskettes" meant "the formal name of 3.5 inch floppies."
I think this is the same nomenclature.