Move towards internal consistency of URL name definitions