More uniform names across UI, script and XML