Fix namespace

MSP-9228
Add UI to class names

MSP-9228