Updated name references