Rename definitions and variables