Naming changes and UI tweak, ignore me :)