Rename some properties