They have expanded into telling importers of pistols (named AR, AK, HK, but I would assume others) that these are not Pistols. And since they aren’t Rifles or Shotguns, they fall into the AOW category. If ATF applies the same logic to your pistol, then it is also an AOW.