As the OP eluded to a concern about the possible but unlikely legal issues pursuing the the platform, the Manufacturers will never use the TM "AR15" again. Nor will any of them use the term M4. If they did they stand a better than excellent chance of having equipment/product named on a bill list, which in it's self will be fairly comprehensive with other identifying criteria.
It is better that we leave the AR15/M4 terminology in the past and move forward with a constantly moving nomenclature.
"They" will take whatever they can get—however ludicrous. They won't get a spec from me. I shoot Modern Sporting Rifles, some of which are self loading.
But I digress.