OP, let the ATF figure that out if/when its time. theres absolutely zero avenue on gods green earth for them to take your NFA items from you because your gender legally changed, so they'll either have a process in place or have to figure one out. thats on them.
Bookmarks