Change Service names
Removed old links
Changed discovery url