Further UI name tweaks