More changes to enable renaming of events to albums