Lots of renamings

Mainly - renaming entities to make names shorter and more clear
Couple of minor changes to UI