More renaming, etc.
Last remains of old jet mangling.
More reorgs.