You are correct in your assumption, srv and wrk in the suffix represent server and workstation. I believe they have stopped that in either P3 or P4.
most mcafee products use the same version/build formats.
you should really make efforts to get onto P4 (18.104.22.1687).
As mcafeenewb says, that has been fixed with the extension in Patch 3