fixed names and added uid