All look good to me. Thanks for addressing my comments regarding simplifying the rules.

Except for one minor comment: I still don't think we need to define rules for source file names (4.3.5.4 EDK II source files within a Library/Module instance).
And the rule "[<CpuArch>][<Vendor>]<FileName>.*" doesn't specify what <FileName> could be. That leads to allowing any style of the file name.