Baloffski, I’ve only known the latter types as annular, certainly that’s how RR and Flight referred to it in the earlier days, though I have seen referrence to it as can-annular. As they still have individual combustion tubes (8?) but placed within a single casing, can-annular is a better description.
John, Yes that’s a later can-annular type you have, the 207 is the 10K + Ib thrust Avon for the late Mk Hunters such as the FGA.9 and exports. Mk207 equated to RA.28 in Rolls parlance. Should look like the first engine in my above pics.