changed uri and names