I went with the BPF unit ...
The turn signals in the 7 inch photo were also changed by installing some Nfieldgear metal bullet lights.
Either way, you need to get the overpriced 7" lamp adapter.
BPF = British Pre-FocusIt is a reflector/Lense assembly with P38D bulbs (vacuum ) and a separate T-9 pilot lamp offset from focus to illuminate the lense.