Rename definitions