Rename components back to contents, for clarity