Fixed the UI names