Added support for changes of name in UI and backend.