Make vault naming more coherent