consistent uid naming