Swap definition names