Rename some objects for clarity