Cleanup element names, transitions, etc.