The terms are somewhat interchangeable, as SSD = "Solid State Disk" (no moving parts) built from "flash" memory. The fastest drives now connect via PCIe lanes, while the first SSDs used the old SATA protocol. The 2015 iMac had already switched over to PCIe-based storage, so any performance difference between 2015 and 2017 will be from advancements in the SSD drives themselves.