Wrap URL pattern

This eases picking Evernote changes
Cleanup: unified and cleaned URLs
Fixed URL pattern name