It seems like a shame that these are going away, and also that we now have to spell out the accordion name in multiple places later on in this file. Maybe leave these in and stash the accordion names somewhere so we only have to change one thing if the UI changes.