Conflict with last added [node-url] token

Last commit added new url/path related tokens.
The [node-url] is already defined by notifications_content creating a nasty bug with pathauto when trying to clean a value that is actually an array (it was added twice one by token and other by notifications content).

Should this be fixed here in the token module because it was the last module that add it or it should be reported back to notifications module for not using a contextual token definition?

(in the case of notifications it should made changes in most of the default values breaking compatibility with existing notification settings and message templates)

A possible fix for token could be just change the name of node-url

These are other tokens defined by notifications_content module (line 847):
$tokens['node']['node-teaser'] = t('The node teaser.');
$tokens['node']['node-body'] = t('The node body.');
$tokens['node']['node-url'] = t('The node view url for read more links.');
$tokens['node']['node-teaser-raw'] = t('Unfiltered node teaser. WARNING - raw user input.');
$tokens['node']['node-body-raw'] = t('Unfiltered node body. WARNING - raw user input.');