Ui: Apply naming convention