Carl
Thats right same fuel filter.
As far as the oil filter goes, it depends if you want the "Fluted" style which the use of a six in one wrench can be used for removing it from the bottom. Or the standard if you want to remove it using a strap wrench or similar from the top. I use Fleetguard filters.
*Fuel Filter FS-19579
*Oil Filter (non fluted for removing from top) LF-3894
Mac