Rename URL names.

For some sort of consistency.

Change-Id: Ic88f92ba96b0cac9d1d5d954d70f5f4a360bb25d