Rename some of the variables and content