Rename some def