fixed names and changed guid to id