Renaming and restructuring
Update to use utility.container name changes
Use the UI event stack fully.