Rename items and sections, refactor some of the code