Replace "_" to "-" in uri

Change-Id: I8b4b12dcc0dd19c2a58ca027af74c77a8f5abc86