more name swaps