Series of minor naming fixes and a few UI tweaks