Rename some definitions.