Lots of renaming, plus now announcements and news feed keep themselves sorted