changes for uri and name attributes